1 files changed, 0 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 077ec901..49733d1f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Main binaries created in *nix builds
 /zerotier-one
 /zerotier-idtool