X-Git-Url: https://git.rvb.name/gitolite-admin.git/blobdiff_plain/090152451bbe6c36fd00734544686585e453b088..cf90a0b9a84555e1a625c299e9b452e61f89b6b0:/conf/gitolite.conf~

diff --git a/conf/gitolite.conf~ b/conf/gitolite.conf~
index 7339ced..33bd171 100644
--- a/conf/gitolite.conf~
+++ b/conf/gitolite.conf~
@@ -73,3 +73,11 @@ repo	gpio-int
 repo    setroute
 	RW+     =       rvb
 	R	=	daemon
+
+<<<<<<< HEAD
+repo	mpd-lua
+=======
+repo	n2100
+>>>>>>> 52688cc783bae6538d47b03712b3e4a2bda8b966
+	RW+	=	rvb
+	R	=	gitweb daemon