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/config.go | |
| parent | a30f5730b384bf99d23f6e83b356e27a14f961d1 (diff) | |
| parent | e403b28eea6959c1d0ed003d955df3dee586083b (diff) | |
| download | dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.gz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.bz2 dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.lz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.xz dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.zst dexon-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.zip | |
Fix merge conflict
Diffstat (limited to 'ethereal/config.go')
| -rw-r--r-- | ethereal/config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ethereal/config.go b/ethereal/config.go index a534bb182..ac4484d0b 100644 --- a/ethereal/config.go +++ b/ethereal/config.go @@ -16,6 +16,7 @@ var UseSeed bool var ImportKey string var ExportKey bool var DataDir string +var AssetPath string func Init() { flag.BoolVar(&StartConsole, "c", false, "debug and testing console") @@ -29,6 +30,7 @@ func Init() { flag.StringVar(&DataDir, "dir", ".ethereal", "ethereum data directory") flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)") flag.IntVar(&MaxPeer, "x", 5, "maximum desired peers") + flag.StringVar(&AssetPath, "asset_path", "", "absolute path to GUI assets directory") flag.Parse() } |