From 41e78f78c08f39e712c7faefe5ebd8ef2fd4d413 Mon Sep 17 00:00:00 2001
From: rileyseaburg <riley@rileyseaburg.com>
Date: Mon, 22 Mar 2021 21:39:35 -0400
Subject: [PATCH] Remove bad JSON code

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

diff --git a/package.json b/package.json
index 04e9984..d78528d 100644
--- 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": {