From: Roman Bazalevskiy <rvb@rvb.name>
Date: Tue, 26 Dec 2017 09:11:11 +0000 (+0300)
Subject: Merge branch 'master' of ssh://rvb.name/gitolite-admin
X-Git-Url: https://git.rvb.name/gitolite-admin.git/commitdiff_plain/7cc314eccafcf99adf3031bb7126371f09166571?hp=090152451bbe6c36fd00734544686585e453b088

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

diff --git a/conf/gitolite.conf b/conf/gitolite.conf
index c1bc90c..067aa86 100644
--- 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 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