More work on GitHub issue #666

2018-01-25 14:16:07 -05:00
parent 7e7723e98f
commit 384e5b66de
4 changed files with 27 additions and 39 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Main binaries created in *nix builds
 /zerotier-one
 /zerotier-idtool