diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-13 18:40:45 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-13 18:40:45 +0800 |
| commit | c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78 (patch) | |
| tree | aa8a175c0c85c963a4110c247348cde29c73cabe /ethereal/assets | |
| parent | 5208b04821a1522c6535835539943d8c874f9fdb (diff) | |
| parent | 03371b74d7b169c0ad6ccf8868bc97c7fe85169d (diff) | |
| download | dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.gz dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.bz2 dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.lz dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.xz dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.tar.zst dexon-c99aa7bdcf46da13f6100ed4cdb0050c0e30ae78.zip | |
Fix merge conflict
Diffstat (limited to 'ethereal/assets')
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 1f3c3874a..14f3bd6d0 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -48,11 +48,11 @@ ApplicationWindow { try { switch(data.call) { case "getBlockByNumber": - var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") + var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") postData(data._seed, block) break case "getBlockByHash": - var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") + var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06") postData(data._seed, block) break case "transact": |