adding .orig to ignored extensions due to merge conflict resolution f…

…or most merge tools
tomkerkhove · Mar 27, 2019 · 008ed5a · 008ed5a
1 parent f3296be
commit 008ed5a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -293,3 +293,4 @@ __pycache__/
 # Local Jekyll output
 _site/*
 docs/_site/*
+*.orig