summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_db.hrl
diff options
context:
space:
mode:
Diffstat (limited to 'src/couchdb/couch_db.hrl')
-rw-r--r--src/couchdb/couch_db.hrl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index 6b6c6440..003cb688 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -177,6 +177,7 @@
view_type = nil,
include_docs = false,
+ conflicts = false,
stale = false,
multi_get = false,
callback = nil,
@@ -271,6 +272,7 @@
timeout,
filter = "",
include_docs = false,
+ conflicts = false,
db_open_options = []
}).