Merge branch 'development' of https://github.com/A2Bcorp/RW_A2B into …

…development
A2Bcorp · Apr 20, 2016 · 9bc8781 · 9bc8781
2 parents 379f6ae + 2611418
commit 9bc8781
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