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

diff --git a/conf/gitolite.conf b/conf/gitolite.conf
index c1bc90c032a5e4ed345aecbcc4c7aa24be76f4e2..067aa8692c81fb5ac815156011f9035c9701f0a1 100644 (file)
--- a/conf/gitolite.conf
+++ b/conf/gitolite.conf
@@ -77,3 +77,7 @@ repo    setroute
 repo   mpd-lua
        RW+     =       rvb
        R       =       gitweb daemon
+
+repo   n2100
+       RW+     =       rvb
+       R       =       gitweb daemon

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