Skip to content

Commit

Permalink
fixup! fix(backend): conflicts were not detected on sync anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
blizzz committed Jul 31, 2023
1 parent 60aa825 commit ecb1932
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Service/ApiService.php
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public function sync(Session $session, Document $document, int $version = 0, ?st
], 404);
} catch (DocumentSaveConflictException) {
try {
/** @noinspection PhpUndefinedVariableInspection */
/** @psalm-suppress PossiblyUndefinedVariable */
$result['outsideChange'] = $file->getContent();
} catch (LockedException) {
// Ignore locked exception since it might happen due to an autosave action happening at the same time
Expand Down

0 comments on commit ecb1932

Please sign in to comment.