Commit b4f585b0 authored by Daniel Gerhardt's avatar Daniel Gerhardt

Add orig files from merge tools to .gitignore

parent 79cb66a4
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*.bak *.bak
*.iml *.iml
*.log *.log
*.orig
.*.sw? .*.sw?
.classpath .classpath
.directory .directory
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment