Lukas Fleischer 643dae80eb 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>		2015-06-04 11:24:56 +02:00
..
html	Show the SSH key field on the registration page	2015-05-31 19:31:36 +02:00
lib	pkgfuncs.inc.php: Remove a conflict marker	2015-06-04 11:24:56 +02:00
locale	Add dummy "web/locale/" directory.	2011-04-10 15:40:49 +02:00
template	Use gitnamespaces for efficient storage	2015-06-01 23:24:52 +02:00