Removed .orig files generated by merge conflicts and added a .gitigno…

…re entry for them
A2Bcorp · Nov 5, 2015 · e4e6b4f · e4e6b4f
1 parent 302fe51
commit e4e6b4f
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 2,501 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# Ignore .orig files generated by merge conflicts
+*.orig
+**/*.orig
diff --git a/Defs/A2BDataDefs/A2BData.xml.orig b/Defs/A2BDataDefs/A2BData.xml.orig
diff --git a/Source/A2B/A2B.csproj.orig b/Source/A2B/A2B.csproj.orig