diff options
author | Chris <[email protected]> | 2020-05-23 13:40:45 -0400 |
---|---|---|
committer | Chris <[email protected]> | 2020-05-23 13:40:45 -0400 |
commit | 1079af5edebaa4ca1f15ee5cab42ef2ef5b60389 (patch) | |
tree | 02304cec5936b2f91f35b5debdcc78cf913b3546 /.gitignore | |
parent | 264df1df7f25e9fa4c6899897ce4953c2caf53df (diff) | |
parent | 8c79cce05aee02f8453c60d605706a5ea8adc764 (diff) |
merge conflicts
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -6,4 +6,5 @@ nodepath.vim autoload/plugged/* session general/paths.vim +wiki/ |