diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:42:46 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 05:42:46 +0800 |
| commit | 6bd1f6cc49acd459e61559e5af515da2db2481e5 (patch) | |
| tree | 3e4f7a51ca8e3cb03d24fbe1898578d88fd7456c /miner/remote_agent.go | |
| parent | bb12dbe233db2e064715b329b7ba987c76ba3bfa (diff) | |
| parent | b0b0939879b9fb8453ec1c8fa2ceb522e56df3bc (diff) | |
| download | dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.gz dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.tar.zst dexon-6bd1f6cc49acd459e61559e5af515da2db2481e5.zip | |
Merge remote-tracking branch 'origin' into rpcargs
Conflicts:
rpc/args.go
Diffstat (limited to 'miner/remote_agent.go')
| -rw-r--r-- | miner/remote_agent.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/miner/remote_agent.go b/miner/remote_agent.go index e92dd5963..aa04a58aa 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -50,6 +50,7 @@ out: break out case work := <-a.workCh: a.work = work + a.returnCh <- nil } } } |