From 0feff296b6eeb3100aaa6f83892b88ee7b2c615a Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 13 Oct 2021 14:10:05 -0400
Subject: [PATCH] Fix merge conflict issue after merging release.

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 5d6604ba10..9981070026 100644
--- 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",