fix udapp ref

7 years ago · 4da637cf68
parent a2de90dc7a
commit 4da637cf68
1 changed files with 0 additions and 3 deletions
--- a/src/app.js
+++ b/src/app.js
@ -46,10 +46,7 @@ var BasicReadOnlyExplorer = require('./app/files/basicReadOnlyExplorer')
 var NotPersistedExplorer = require('./app/files/NotPersistedExplorer')
 var toolTip = require('./app/ui/tooltip')
 var CommandInterpreter = require('./lib/cmdInterpreter')
-<<<<<<< HEAD
 var TransactionReceiptResolver = require('./transactionReceiptResolver')
-=======
->>>>>>> refactor rhpp

 var styleGuide = require('./app/ui/styles-guide/theme-chooser')
 var styles = styleGuide.chooser()