summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChris <[email protected]>2020-05-23 13:40:45 -0400
committerChris <[email protected]>2020-05-23 13:40:45 -0400
commit1079af5edebaa4ca1f15ee5cab42ef2ef5b60389 (patch)
tree02304cec5936b2f91f35b5debdcc78cf913b3546 /.gitignore
parent264df1df7f25e9fa4c6899897ce4953c2caf53df (diff)
parent8c79cce05aee02f8453c60d605706a5ea8adc764 (diff)
merge conflicts
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e7ce79f8..db1d8dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ nodepath.vim
autoload/plugged/*
session
general/paths.vim
+wiki/