diff options
| author | Paul Buetow <pbuetow@mimecast.com> | 2020-11-22 10:31:55 +0000 |
|---|---|---|
| committer | Paul Buetow <pbuetow@mimecast.com> | 2020-11-22 10:31:55 +0000 |
| commit | 2cb5bc050eeeea4df5e8f57778c107d98f37dfbc (patch) | |
| tree | 56ec265ba3466d73fef4a0b7143ed2c7098455f1 /.gitignore | |
| parent | 97827c2247498eefe0263f043a0cd6eca962077d (diff) | |
| parent | 7ee0121afed3e7cab6457142f70e411020ab2b21 (diff) | |
merge
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1,4 +1,14 @@ *_proprietary.go +<<<<<<< HEAD cache/ log/ tags +======= +/cache/ +/log/ +/dtail +/dgrep +/dcat +/dmap +/dserver +>>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21 |