From 53f9036c12d02ce81ae8f4c77abb8b031c7a803b Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 15 Aug 2014 19:33:32 -0400
Subject: [PATCH] fix build

---
 util/build.js | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/util/build.js b/util/build.js
index a42a12643..4c764fb2b 100644
--- a/util/build.js
+++ b/util/build.js
@@ -41,37 +41,9 @@ var createBundle = function(opts) {
   b.require('./js/models/core/Wallet', {
     expose: '../../js/models/core/Wallet'
   });
-<<<<<<< HEAD
-=======
   b.require('./js/models/core/WalletLock', {
     expose: '../js/models/core/WalletLock'
   });
-
-  b.require('./test/mocks/FakeStorage', {
-    expose: './mocks/FakeStorage'
-  });
-  b.require('./test/mocks/FakeLocalStorage', {
-    expose: './mocks/FakeLocalStorage'
-  });
-  b.require('./js/models/core/Message', {
-    expose: '../js/models/core/Message'
-  });
-  b.require('./test/mocks/FakeBlockchain', {
-    expose: './mocks/FakeBlockchain'
-  });
-  b.require('./test/mocks/FakeNetwork', {
-    expose: './mocks/FakeNetwork'
-  });
-  b.require('./test/mocks/FakePayProServer', {
-    expose: './mocks/FakePayProServer'
-  });
-  b.require('./test/mocks/FakePayProServer', {
-    expose: '../../mocks/FakePayProServer'
-  });
-  b.require('./test/mocks/FakeBuilder', {
-    expose: './mocks/FakeBuilder'
-  });
->>>>>>> add WalletLock class
   b.require('./js/models/network/WebRTC', {
     expose: '../js/models/network/WebRTC'
   });
@@ -124,7 +96,7 @@ var createBundle = function(opts) {
     });
   }
 
-  if (!opts.dontminify) {
+  if (!opts.debug) {
     b.transform({
       global: true
     }, 'uglifyify');