diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-14 17:35:49 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-14 17:36:12 +0800 |
| commit | 47a801455966298d1d1519eebb955024c8f02b84 (patch) | |
| tree | 5b8144ba4844092dc0bae599fc3314eaacf1a7b4 /cmd/faucet | |
| parent | 19982f946735948478b6b7e7706f1b615f171d0d (diff) | |
| parent | 3654aeaa4f87452ac5bc801a18808189595e2ef8 (diff) | |
| download | dexon-47a801455966298d1d1519eebb955024c8f02b84.tar dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.gz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.bz2 dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.lz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.xz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.zst dexon-47a801455966298d1d1519eebb955024c8f02b84.zip | |
cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Fix a conflict in cmd/swarm envVarsOverride function.
Diffstat (limited to 'cmd/faucet')
| -rw-r--r-- | cmd/faucet/faucet.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 328029fdf..5f16f2978 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -506,7 +506,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { // Send an error if too frequent funding, othewise a success if !fund { - if err = sendError(conn, fmt.Errorf("%s left until next allowance", common.PrettyDuration(timeout.Sub(time.Now())))); err != nil { + if err = sendError(conn, fmt.Errorf("%s left until next allowance", common.PrettyDuration(timeout.Sub(time.Now())))); err != nil { // nolint: gosimple log.Warn("Failed to send funding error to client", "err", err) return } |