Added .orig to gitignore to ignore left over files from merge tool

yowshi · Aug 16, 2016 · 6dcdc06 · 6dcdc06
1 parent 52805f1
commit 6dcdc06
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,9 @@ assets/*
 /sounds
 /videos
 
+# Merge tool left over files
+*.orig
+
 # Website directory
 
 website/*