Remove bad JSON code

RileySeaburg · Mar 23, 2021 · 41e78f7 · 41e78f7
1 parent 1f0f170
commit 41e78f7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -8,12 +8,8 @@
   "license": "MIT",
   "private": false,
   "scripts": {
-<<<<<<< HEAD
-    "dev": "yarn && concurrently \"yarn dev:backend\" \"yarn dev:frontend\"",    "dev:backend": "cd backend && docker-compose up",
-=======
     "dev": "yarn && concurrently \"yarn dev:backend\" \"yarn dev:frontend\"",
     "dev:backend": "cd backend && docker-compose up",
->>>>>>> Update Readme and Scripts
     "dev:frontend": "cd frontend && yarn && yarn upgrade && yarn dev"
   },
   "devDependencies": {