| commit | 643dae80ebe6c44abeac0545655788b12dabfbea | |
| author | Lukas Fleischer <lfleischer@archlinux.org> | |
| Wed, 3 Jun 2015 06:06:40 +0000 (3 08:06 +0200) | ||
| committer | Lukas Fleischer <lfleischer@archlinux.org> | |
| Thu, 4 Jun 2015 09:24:56 +0000 (4 11:24 +0200) | ||
| tree | 06b6db739494e39b5cfc6d2c2ed5bdcdf8403105 | treesnapshot (tar.gz zip) |
| parent | c38f95f63221d23b109042b32b4eb94b40b25d2c | commitdiff |
pkgfuncs.inc.php: Remove a conflict marker
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>
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>
| web/lib/pkgfuncs.inc.php | diffblobblamehistory |