fix merge conflict

This commit is contained in:
Luke Pulverenti
2017-03-08 02:24:17 -05:00
parent 49fd5551ba
commit 0ac0a09c80
+1 -1
View File
@@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.5")]
[assembly: AssemblyVersion("3.2.6.1")]