1 files changed, 4 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index c9e8333..2524196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,9 @@
-*_proprietary.go
-<<<<<<< HEAD
-cache/
-log/
-tags
-=======
-/cache/
-/log/
+/cache
+/log
+/tags
 /dtail
 /dgrep
 /dcat
 /dmap
 /dserver
->>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21
+/bin