1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index c9e8333..5ea912f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 *_proprietary.go
-<<<<<<< HEAD
+*.csv
+*.tmp
+*.out
 cache/
 log/
 tags
-=======
 /cache/
 /log/
 /dtail
@@ -11,4 +12,3 @@ tags
 /dcat
 /dmap
 /dserver
->>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21