diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
| commit | ee5e7f2b350202ed2d2e64265d18d0462bd21c91 (patch) | |
| tree | 8ea2a6305d58e8d56b16e9869850961b61b7d25c /ethereal/ethereum.go | |
| parent | a30f5730b384bf99d23f6e83b356e27a14f961d1 (diff) | |
| parent | e403b28eea6959c1d0ed003d955df3dee586083b (diff) | |
| download | go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.gz go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.bz2 go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.lz go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.xz go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.zst go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.zip | |
Fix merge conflict
Diffstat (limited to 'ethereal/ethereum.go')
| -rw-r--r-- | ethereal/ethereum.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index 618d2b00f..99f3b0b52 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -100,11 +100,11 @@ func main() { os.Exit(0) } - log.Printf("Starting Ethereum v%s\n", ethutil.Config.Ver) + log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver) // Set the max peers ethereum.MaxPeers = MaxPeer gui := ethui.New(ethereum) - gui.Start() + gui.Start(AssetPath) } |