From 3eb2708c3d2462334a6b52e7a9d04813de0b73ba Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 3 Nov 2012 21:56:21 +0100
Subject: forgot merge pointer

---
 provider/services/couchdb.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/provider/services/couchdb.json b/provider/services/couchdb.json
index 52b5372..d0fe97f 100644
--- a/provider/services/couchdb.json
+++ b/provider/services/couchdb.json
@@ -13,4 +13,3 @@
     "pw":   "Eibe2rae"
   }
 }
->>>>>>> e0f03d9... adding couchdb_leap_ca_user + couchdb_leap_web_user
-- 
cgit v1.2.3