diff options
author | Tianon Gravi <admwiggin@gmail.com> | 2015-01-15 12:50:40 -0700 |
---|---|---|
committer | Tianon Gravi <admwiggin@gmail.com> | 2015-01-15 12:50:40 -0700 |
commit | 2a0db60599fdd75b1bc3e297180fbe1282763759 (patch) | |
tree | 68d43c3e30d9ab961ddf6b7365201ca6b675b253 /src/net/testdata/empty-resolv.conf | |
parent | ef33cba3c8de6c431df56503df51fcd3a473c89e (diff) | |
parent | f154da9e12608589e8d5f0508f908a0c3e88a1bb (diff) | |
download | golang-2a0db60599fdd75b1bc3e297180fbe1282763759.tar.gz |
Merge tag 'upstream/1.4' into debian-experimental
* tag 'upstream/1.4':
Imported Upstream version 1.4
Diffstat (limited to 'src/net/testdata/empty-resolv.conf')
-rw-r--r-- | src/net/testdata/empty-resolv.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/net/testdata/empty-resolv.conf b/src/net/testdata/empty-resolv.conf new file mode 100644 index 000000000..c4b2b5765 --- /dev/null +++ b/src/net/testdata/empty-resolv.conf @@ -0,0 +1 @@ +# /etc/resolv.conf |