fix merge conflicts

This commit is contained in:
Luke Pulverenti
2017-04-20 23:49:33 -04:00
parent 885d1f55a6
commit 5dca8cb077
+1 -1
View File
@@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.12")]
[assembly: AssemblyVersion("3.2.12.11")]