Ignore git merge conflict files

e9cb4506 · Simon Spannagel · 22a15378 · e9cb4506
Commit e9cb4506 authored Nov 06, 2018 by Simon Spannagel
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ CMakeLists.txt.user
 *.d
 *.so
 *.pcm
+
+# Ignore conflict files:
+*.orig