1 files changed, 10 insertions, 0 deletions

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