external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgfuncs.inc.php: Remove a conflict marker

Browse source 
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 <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2015-06-03 08:06:40 +02:00
parent c38f95f632
commit 643dae80eb
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
web/lib/pkgfuncs.inc.php
View file

@ -779,7 +779,6 @@ function sanitize_ids($ids) {
} }
/** /**
<<<<<<< HEAD
* Add package information to the database for a specific package * Add package information to the database for a specific package
* *
* @param int $base_id ID of the package base * @param int $base_id ID of the package base