diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-25 14:16:07 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-25 14:16:07 -0500 |
| commit | 384e5b66decbbe3eda00b95690c6a56cb140c4f7 (patch) | |
| tree | acceb68d97d6f907eece4df86ab38d6a2387474d /.gitignore | |
| parent | 7e7723e98f1d9d9a6f85665cc87543e7e37ac47c (diff) | |
| download | infinitytier-384e5b66decbbe3eda00b95690c6a56cb140c4f7.tar.gz infinitytier-384e5b66decbbe3eda00b95690c6a56cb140c4f7.zip | |
More work on GitHub issue #666
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,4 +1,3 @@ -<<<<<<< HEAD # Main binaries created in *nix builds /zerotier-one /zerotier-idtool |