diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-04-01 19:18:42 +0800 |
| commit | ee5e7f2b350202ed2d2e64265d18d0462bd21c91 (patch) | |
| tree | 8ea2a6305d58e8d56b16e9869850961b61b7d25c /.gitignore | |
| parent | a30f5730b384bf99d23f6e83b356e27a14f961d1 (diff) | |
| parent | e403b28eea6959c1d0ed003d955df3dee586083b (diff) | |
| download | go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.gz go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.bz2 go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.lz go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.xz go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.tar.zst go-tangerine-ee5e7f2b350202ed2d2e64265d18d0462bd21c91.zip | |
Fix merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f725d58d1..f816a06a1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ *un~ .DS_Store */**/.DS_Store +./ethereum/ethereum |