summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <pbuetow@mimecast.com>2021-03-16 10:59:49 +0000
committerPaul Buetow <pbuetow@mimecast.com>2021-03-16 10:59:49 +0000
commit9efd8680de471e5203d77363622b2c2faa45ff54 (patch)
tree1686250090b1bff71903a90f5250a7990c3b6389
parent950b069ef73f06218236fba0b51b28e791c579f7 (diff)
fix gitignore
-rw-r--r--.gitignore13
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