summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/lib/pkgfuncs.inc.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 2b5afaa9..ee63e422 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/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