Merge

Author: schmidt-sebastian

packages/firestore/CHANGELOG.md

@@ -1,15 +1,9 @@
 # Unreleased
-<<<<<<< HEAD
-- [fixed] Fixed an issue where documents could be cached as deleted when
-  they should not have been, leading to queries returning fewer results than
-  they should (firebase/firebase-ios-sdk#1548).
-=======
 - [fixed] Fixed an issue where queries returned fewer results than they should,
   caused by documents that were cached as deleted when they should not have
   been (firebase/firebase-ios-sdk#1548). Because some cache data is cleared,
   clients might use extra bandwidth the first time they launch with this
   version of the SDK.
->>>>>>> master
 - [feature] Added `firebase.firestore.FieldValue.arrayUnion()` and
   `firebase.firestore.FieldValue.arrayRemove()` to atomically add and remove
   elements from an array field in a document.

packages/firestore/src/core/sync_engine.ts

@@ -523,7 +523,6 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
 
     const limboResolution = this.limboResolutionsByTarget[targetId];
     const limboKey = limboResolution && limboResolution.key;
-
     if (limboKey) {
       // Since this query failed, we won't want to manually unlisten to it.
       // So go ahead and remove it from bookkeeping.