summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-09-19 13:22:59 +0300
committerPaul Buetow <paul@buetow.org>2021-10-02 12:26:29 +0300
commitfe3e68afd99d8ea246be52893730f987e138ec24 (patch)
tree726e0914730912e0a3b223f7b37facc05ba31140 /.gitignore
parentabeac87aec44249bf67f1b0eca471a31086265ca (diff)
move args to config package
logger package rewrite as dlog
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index c9e8333..1f158b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
*_proprietary.go
-<<<<<<< HEAD
+*.csv
+*.tmp
cache/
log/
tags
-=======
/cache/
/log/
/dtail
@@ -11,4 +11,3 @@ tags
/dcat
/dmap
/dserver
->>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21