summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-03 21:56:21 +0100
committervarac <varacanero@zeromail.org>2012-11-03 21:56:21 +0100
commit3eb2708c3d2462334a6b52e7a9d04813de0b73ba (patch)
treeae603ab7aa885f436b145104a01cd307379fa936
parent9c95241adb5256f45b62f92673bc4cb3b7d4ffe8 (diff)
forgot merge pointer
-rw-r--r--provider/services/couchdb.json1
1 files changed, 0 insertions, 1 deletions
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