Merge pull request #5 from cloudant/allow-conflict-resolution

Allow conflict resolution
apache · Mar 5, 2013 · c296cae · c296cae
2 parents 59a5b60 + 00bd756
commit c296cae
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/custodian/src/custodian.hrl b/src/custodian/src/custodian.hrl
@@ -6,6 +6,7 @@
 <<"function(newDoc, oldDoc) {
  var i, range, node;
  if(newDoc['_id'].substring(0, 8) === \"_design/\") return;
+ if(newDoc['_deleted'] === true) return;
  if (!newDoc.by_node) {
  throw({forbidden: \"by_node is mandatory\"});
  }