Reflect spec changes

This commit is contained in:
Victor Dubiniuk 2013-08-10 16:52:09 +03:00 committed by Tobias Hintze
parent 60d53c6d7c
commit 69def939cb

View File

@ -104,7 +104,7 @@ try{
} else { // HEADs do not match
$response["ops"] = OCA\Office\Op::getOpsAfterJson($esId, $seqHead);
$response["head_seq"] = $currentHead;
$response["result"] = $hasOps ? 'conflict' : 'newOps';
$response["result"] = $hasOps ? 'conflict' : 'new_ops';
}
} else {
// Error - no seq_head passed