diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2015-06-03 08:06:40 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2015-06-04 11:24:56 +0200 |
| commit | 643dae80ebe6c44abeac0545655788b12dabfbea (patch) | |
| tree | 06b6db739494e39b5cfc6d2c2ed5bdcdf8403105 /web/html/login.php | |
| parent | c38f95f63221d23b109042b32b4eb94b40b25d2c (diff) | |
| download | aurweb-643dae80ebe6c44abeac0545655788b12dabfbea.tar.xz | |
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>
Diffstat (limited to 'web/html/login.php')
0 files changed, 0 insertions, 0 deletions