ignore conflict files

2014-08-08 05:47:15 +10:00
parent 9a8e889dfc
commit 7d20ad6a1b
1 changed files with 4 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,10 @@ __pycache__/
 *.swo
 *#

+# conflicts
+*.orig
+*.rej
+
 # QtCreator
 CMakeLists.txt.user