From 857f4df0fa5bb762e897756a7af65e019709e9cb Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Thu, 14 May 2020 10:53:55 -0500
Subject: [PATCH] Fix missed conflict res

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

diff --git a/scripts/package.json b/scripts/package.json
index fe163bc470..915011d419 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -94,11 +94,7 @@
     "burnthemall": "node ./tasks/burnthemall.js",
     "lint": "eslint --ignore-pattern 'color-thief.js' --ignore-pattern 'app/node_modules' --ignore-pattern 'vendor' --ignore-pattern '*.build.js' --ignore-pattern 'assets' --fix app",
     "rebuild": "gulp rebuild",
-<<<<<<< HEAD:package.json
-    "release": "npm run build && electron-builder -p never && gulp postbuild",
-=======
     "release": "electron-builder -p never && gulp postbuild",
->>>>>>> blue-hyperdrive10:scripts/package.json
     "start": "gulp start",
     "watch": "gulp start-watch"
   },