Merge branch 'master' of ssh://rvb.name/gitolite-admin

[gitolite-admin.git] / conf / gitolite.conf~

diff --git a/conf/gitolite.conf~ b/conf/gitolite.conf~
index 7339ced43818b755d785e99f68b07597de343452..33bd171e3527507f1b8c64306a1d3087051e7c79 100644 (file)
--- 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