From 384e5b66decbbe3eda00b95690c6a56cb140c4f7 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 25 Jan 2018 14:16:07 -0500
Subject: More work on GitHub issue #666

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitignore')

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
-- 
cgit v1.2.3