From a8cc61c81001a8468b8c12780ebc54f21c24a762 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 26 Jun 2018 18:06:30 +0200 Subject: [PATCH] fix udapp ref --- src/app.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app.js b/src/app.js index 03bc0ba832..bfef9b84b4 100644 --- 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()