From 643dae80ebe6c44abeac0545655788b12dabfbea Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 3 Jun 2015 08:06:40 +0200 Subject: pkgfuncs.inc.php: Remove a conflict marker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove a Git conflict marker that was added accidentally in 74edb6f (Use Git repositories to store packages, 2014-06-06). Reported-by: Johannes Löthberg Signed-off-by: Lukas Fleischer --- web/lib/pkgfuncs.inc.php | 1 - 1 file changed, 1 deletion(-) (limited to 'web') diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 2b5afaa..ee63e42 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 -- cgit v1.2.3-70-g09d2