Commit 29127dfa authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Ignore merge conflict original copies

parent ef5416cb
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -44,3 +44,6 @@

# Ignore files created from unit tests
/etc/unittests/output/

# Ignore merge conflict original copies
*.orig