Comparing version 8.11.0 to 8.12.0
@@ -230,3 +230,3 @@ 'use strict'; | ||
const opt = { | ||
conflict: options.merge ? 'update' : 'error', | ||
conflict: options.merge ? (options.merge === 'replace' ? 'replace' : 'update') : 'error', | ||
returnChanges: !!postUnique | ||
@@ -233,0 +233,0 @@ }; |
{ | ||
"name": "penseur", | ||
"description": "Lightweight RethinkDB wrapper", | ||
"version": "8.11.0", | ||
"version": "8.12.0", | ||
"repository": "git://github.com/hueniverse/penseur", | ||
@@ -6,0 +6,0 @@ "main": "lib/index.js", |
76820