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 <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>

web/lib/pkgfuncs.inc.php

@@ -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