From 97555be76095e9c41bf9a70182216d607a07a0c4 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 26 Jun 2018 10:50:59 +0200 Subject: [PATCH] refactor rhpp --- src/app.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app.js b/src/app.js index bfef9b84b4..03bc0ba832 100644 --- 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()