Commit e9cb4506 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Ignore git merge conflict files

parent 22a15378
......@@ -31,3 +31,6 @@ CMakeLists.txt.user
*.d
*.so
*.pcm
# Ignore conflict files:
*.orig
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