Final merge fix

Author: dwyfrequency

packages/database/package.json

@@ -53,15 +53,9 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-    "rollup-plugin-typescript2": "0.31.2",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.34.1",
->>>>>>> f51379262 (Update rollup deps)
     "typescript": "4.2.2"
   },
   "repository": {

packages/functions-compat/package.json

@@ -27,13 +27,8 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app-compat": "0.1.37",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app-compat": "0.1.36",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.34.1",
     "typescript": "4.2.2"

packages/functions/package.json

@@ -46,13 +46,8 @@
     "@firebase/app": "0.x"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.34.1",
     "typescript": "4.2.2"

packages/installations-compat/package.json

@@ -45,13 +45,8 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app-compat": "0.1.37",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app-compat": "0.1.36",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",

packages/installations/package.json

@@ -50,13 +50,8 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",