Fix merge conflict issue after merging release.

ember-cli · Oct 13, 2021 · 0feff29 · 0feff29
1 parent f62562d
commit 0feff29
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "ember-cli",
-<<<<<<< HEAD
   "version": "4.0.0-beta.1",
-=======
-  "version": "3.28.2",
->>>>>>> origin/release
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",