X-Git-Url: https://git.rvb.name/gitolite-admin.git/blobdiff_plain/7cc314eccafcf99adf3031bb7126371f09166571..dd5709cb888e249c8c468b6171268d5cb797d0c7:/conf/gitolite.conf~?ds=inline

diff --git a/conf/gitolite.conf~ b/conf/gitolite.conf~
index 33bd171..5d2c9e0 100644
--- a/conf/gitolite.conf~
+++ b/conf/gitolite.conf~
@@ -1,8 +1,12 @@
-repo    gitolite-admin
-        RW+     =   	rvb
+repo gitolite-admin
+    RW+     =   rvb
 
-repo    testing
-        RW+     =   	@all
+repo    weathermon
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	openhab-process
+	RW+	=	rvb
 	R	=	gitweb daemon
 
 repo	openlib
@@ -21,10 +25,6 @@ repo	zenbook-als
 	RW+	=	rvb
 	R	=	gitweb daemon
 
-repo	weathermon
-	RW+	=	rvb
-	R	=	gitweb daemon
-
 repo	oss-streamer
 	RW+	=	rvb
 	R	=	gitweb daemon
@@ -50,10 +50,6 @@ repo	php
 	RW+	=	rvb
 	R	=	gitweb daemon
 
-repo	openhab-process
-	RW+	=	rvb
-	R	=	gitweb daemon
-
 repo	mpd-web
 	RW+	=	rvb
 	R	=	gitweb daemon
@@ -74,10 +70,22 @@ repo    setroute
 	RW+     =       rvb
 	R	=	daemon
 
-<<<<<<< HEAD
 repo	mpd-lua
-=======
+	RW+	=	rvb
+	R	=	gitweb daemon
+
 repo	n2100
->>>>>>> 52688cc783bae6538d47b03712b3e4a2bda8b966
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo 	mqtt-noolite
+	RW+ 	=	rvb
+	R	=	gitweb daemon
+
+repo	lua-filemanager
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	lua-squid-acl-helper
 	RW+	=	rvb
 	R	=	gitweb daemon