Commit 27e6fc78 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Ignore merge conflict original copies

(cherry picked from commit 29127dfa)
parent f7c29d0d
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