chore: resolve merge conflicts

aws-amplify · Jan 3, 2024 · 6123cfd · 6123cfd
1 parent 9265430
commit 6123cfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ionSync/AWSMutationDatabaseAdapter/AWSMutationDatabaseAdapter+MutationEventIngester.swift b/...ionSync/AWSMutationDatabaseAdapter/AWSMutationDatabaseAdapter+MutationEventIngester.swift
@@ -32,7 +32,7 @@ extension AWSMutationDatabaseAdapter: MutationEventIngester {
     /// rejects the event with an error
     func resolveConflictsThenSave(mutationEvent: MutationEvent,
                                   storageAdapter: StorageEngineAdapter,
-                                  completion: @escaping (Result<MutationEvent, DataStoreError>)->Void) {
+                                  completion: @escaping (Result<MutationEvent, DataStoreError>) -> Void) {
         MutationEvent.pendingMutationEvents(
             forMutationEvent: mutationEvent,
             storageAdapter: storageAdapter) { result in

diff --git a/...rePlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/ReconcileAndLocalSaveOperation.swift b/...rePlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/ReconcileAndLocalSaveOperation.swift
@@ -496,7 +496,7 @@ class ReconcileAndLocalSaveOperation: AsynchronousOperation {
                 .collect()
                 .sink(receiveCompletion: { _ in
                     promise(.successfulVoid)
-                }, receiveValue:  { _ in  })
+                }, receiveValue: { _ in  })
                 .store(in: &self.cancellables)
         }
     }