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>
Please register or sign in to comment