Reflect spec changes
This commit is contained in:
		
							parent
							
								
									60d53c6d7c
								
							
						
					
					
						commit
						69def939cb
					
				| @ -104,7 +104,7 @@ try{ | |||||||
| 				} else { // HEADs do not match
 | 				} else { // HEADs do not match
 | ||||||
| 					$response["ops"] = OCA\Office\Op::getOpsAfterJson($esId, $seqHead); | 					$response["ops"] = OCA\Office\Op::getOpsAfterJson($esId, $seqHead); | ||||||
| 					$response["head_seq"] = $currentHead; | 					$response["head_seq"] = $currentHead; | ||||||
| 					$response["result"] = $hasOps ? 'conflict' : 'newOps'; | 					$response["result"] = $hasOps ? 'conflict' : 'new_ops'; | ||||||
| 				} | 				} | ||||||
| 			} else { | 			} else { | ||||||
| 				// Error - no seq_head passed
 | 				// Error - no seq_head passed
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user