Commit 643dae80 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

pkgfuncs.inc.php: Remove a conflict marker

Remove a Git conflict marker that was added accidentally in 74edb6fe

 (Use
Git repositories to store packages, 2014-06-06).
Reported-by: Johannes Löthberg's avatarJohannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent c38f95f6
......@@ -779,7 +779,6 @@ function sanitize_ids($ids) {
}
/**
<<<<<<< HEAD
* Add package information to the database for a specific package
*
* @param int $base_id ID of the package base
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment