Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cccaaf9 authored by Joshua Baxter's avatar Joshua Baxter Committed by android-build-merger
Browse files

Merge "docs: fix typo" into qt-dev am: 4fa49b45 am: 5cc0a675

am: ffbebe1f

Change-Id: I2e9a580dad500431c1eca2aabed8d2c723009bd4
parents fc66e118 ffbebe1f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class SyncStats implements Parcelable {
     * attempted to update or delete a version of a resource on the server. This is expected
     * to clear itself automatically once the new state is retrieved from the server,
     * though it may remain until the user intervenes manually, perhaps by clearing the
     * local storage and starting over frmo scratch. This is considered a hard error.
     * local storage and starting over from scratch. This is considered a hard error.
     */
    public long numConflictDetectedExceptions;