diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -16,4 +16,10 @@ Vagrantfile .coverage* /.cache +<<<<<<< HEAD .pytest_cache/ +======= +Gemfile +Gemfile.lock +_site/ +>>>>>>> 600be0a... Added anchor.js to docs |