Merge 2d267f7 into 141229c

firebase · May 6, 2019 · fc2abed · fc2abed
2 parents 141229c + 2d267f7
commit fc2abed
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "firebase-tools",
-<<<<<<< HEAD
-  "version": "6.9.0",
-=======
   "version": "6.8.0",
->>>>>>> master
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {