ignore merge conflict backup files

2016-10-04 17:02:53 +02:00
parent 66d71f4128
commit 696eefb7ac
1 changed files with 1 additions and 0 deletions
@@ -7,3 +7,4 @@ xml/PenText.xpr
 *.pyc

 .DS_Store
+*.orig