refactor rhpp

7 years ago · 4a9847fc59
parent 3b6bea0019
commit 4a9847fc59
1 changed files with 3 additions and 0 deletions
--- a/src/app.js
+++ b/src/app.js
@ -46,7 +46,10 @@ 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()