Fix merge conflicts

2014-05-22 10:26:39 +02:00
parent 93d79babc9 01b833146f
commit 8419ba0ec0
5 changed files with 73 additions and 3 deletions
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -6,6 +6,7 @@ import QtQuick.Window 2.1;
 import QtQuick.Controls.Styles 1.1
 import Ethereum 1.0

+
 ApplicationWindow {
 	id: root

--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -188,7 +188,7 @@ ApplicationWindow {

 		WebView {
 			id: inspector
-			visible: false
+			visible:true
 			url: webview.experimental.remoteInspectorUrl
 			anchors {
 				left: root.left