consts

Author: morganchen12

firestore-next/test.firestore.js

@@ -1159,7 +1159,6 @@ describe("firestore", () => {
     });
 
     describe("aggregate queries", () => {
-<<<<<<< HEAD
         it("should fetch the count of documents in a collection", async () => {
             const { collection, getCountFromServer } = require("firebase/firestore"); 
             // [START count_aggregate_collection]
@@ -1178,24 +1177,6 @@ describe("firestore", () => {
             console.log('count: ', snapshot.data().count);
             // [END count_aggregate_query]
         });
-=======
-      it("should fetch the count of documents in a collection", async () => {
-        // [START count_aggregate_collection]
-        const coll = collection(db, "cities");
-        const snapshot = await getCountFromServer(coll);
-        console.log('count: ', snapshot.data().count);
-        // [END count_aggregate_collection]
-      });
-
-      it("should fetch the count of documents in a query", async () => {
-        // [START count_aggregate_query]
-        const coll = collection(db, "cities");
-        const query = query(coll, where("state", "==", "CA"));
-        const snapshot = await getCountFromServer(query);
-        console.log('count: ', snapshot.data().count);
-        // [END count_aggregate_query]
-      });
->>>>>>> 09d36f3 (add simpler snippet)
     });
 
     // TODO: Break out into separate file