pull/1/head
Victor Dubiniuk 11 years ago committed by Tobias Hintze
parent accbdf7284
commit 842c397e38

@ -86,7 +86,7 @@ try{
$response["headSeq"] = $currentHead; $response["headSeq"] = $currentHead;
} }
} else { // HEADs do not match } else { // HEADs do not match
$response["ops"] = OCA\Office\Op::getOpsAfter($esId, $seqHead); $response["ops"] = OCA\Office\Op::getOpsAfterJson($esId, $seqHead);
$response["headSeq"] = $currentHead; $response["headSeq"] = $currentHead;
$response["result"] = $hasOps ? 'conflict' : 'newOps'; $response["result"] = $hasOps ? 'conflict' : 'newOps';
} }

Loading…
Cancel
Save