diff options
author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
---|---|---|
committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
commit | 3068e2688d88912ec33f3d80fd0fe26c4e897dcd (patch) | |
tree | ee32ccd17faf650f3e933e9a2d8b4ab52f0d7746 /Godeps/Readme | |
parent | 1878630b591b039fadb6f88e15340d04f4af3ed1 (diff) | |
parent | 68f6ddc5aaa7ff29d09c1519ccd38d9cf16c0f75 (diff) | |
download | go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.gz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.bz2 go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.lz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.xz go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.zst go-tangerine-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.zip |
merge conflicts
Diffstat (limited to 'Godeps/Readme')
-rw-r--r-- | Godeps/Readme | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Godeps/Readme b/Godeps/Readme new file mode 100644 index 000000000..4cdaa53d5 --- /dev/null +++ b/Godeps/Readme @@ -0,0 +1,5 @@ +This directory tree is generated automatically by godep. + +Please do not edit. + +See https://github.com/tools/godep for more information. |