diff options
| author | Janos Guljas <janos@resenje.org> | 2018-02-23 01:50:47 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-02-23 01:51:34 +0800 |
| commit | 6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e (patch) | |
| tree | 442ae3e5d75fa5418b362474754d319a7fdfa8f0 /cmd/swarm | |
| parent | a3a07350dcef0ba39829a20d8ddba4bd3463d293 (diff) | |
| parent | 221486a29109803286c1448426d6180ef5024cf0 (diff) | |
| download | go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.gz go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.bz2 go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.lz go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.xz go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.tar.zst go-tangerine-6a9730edaa3c398ef1e9fe084f9b16de4d3ef78e.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Diffstat (limited to 'cmd/swarm')
| -rw-r--r-- | cmd/swarm/run_test.go | 2 | ||||
| -rw-r--r-- | cmd/swarm/upload_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index ed1502868..594cfa55c 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 The go-ethereum Authors +// Copyright 2017 The go-ethereum Authors // This file is part of go-ethereum. // // go-ethereum is free software: you can redistribute it and/or modify diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 5656186e1..df7fc216a 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -1,4 +1,4 @@ -// Copyright 2016 The go-ethereum Authors +// Copyright 2017 The go-ethereum Authors // This file is part of go-ethereum. // // go-ethereum is free software: you can redistribute it and/or modify |