From 2b8f46cb8cfc71da7e51b2683d222035c31c4d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Fri, 15 May 2015 15:27:23 +0200
Subject: [PATCH] resolving merge conflict #2

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

diff --git a/package.json b/package.json
index 0fd0da1d..ec1ad915 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,8 @@
   "description": "Das neue web client for Ascribe",
   "main": "js/app.js",
   "scripts": {
-<<<<<<< HEAD
-    "start": "watchify -o js/bundle.js -v -d js/app.js",
-    "build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > js/bundle.min.js",
-=======
     "watch": "watchify -o build/app.js -v -d js/app.js",
     "build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > build/app.js",
->>>>>>> b000ecd925e2e23febd47b088384cf6d5d155a9c
     "test": "jest"
   },
   "author": "Ascribe",