summaryrefslogtreecommitdiff
path: root/provider/services/couchdb.json
diff options
context:
space:
mode:
Diffstat (limited to 'provider/services/couchdb.json')
-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