aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-05-22 16:26:39 +0800
committerMaran <maran.hidskes@gmail.com>2014-05-22 16:26:39 +0800
commit8419ba0ec068779dd72dc67cce44a30f9ed2873f (patch)
tree6f7af48b7711aa9648e0a0b9d8b91918b3e07c41 /ethereal
parent93d79babc9fb1e1c66e6c108f1925212d394db06 (diff)
parent01b833146f3afa214586a1ffb710546a5e4cc90a (diff)
downloadgo-tangerine-8419ba0ec068779dd72dc67cce44a30f9ed2873f.tar.gz
go-tangerine-8419ba0ec068779dd72dc67cce44a30f9ed2873f.tar.zst
go-tangerine-8419ba0ec068779dd72dc67cce44a30f9ed2873f.zip
Fix merge conflicts
Diffstat (limited to 'ethereal')
-rw-r--r--ethereal/assets/qml/wallet.qml1
-rw-r--r--ethereal/assets/qml/webapp.qml2
2 files changed, 2 insertions, 1 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 51f064adf..dee31a04e 100644
--- 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
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index d3cffeeca..f00b04599 100644
--- 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