fix merge conflict

This commit is contained in:
Luke Pulverenti
2017-06-01 03:56:55 -04:00
parent 13ae45d33d
commit 1f5e51b633
+1 -1
View File
@@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.18.0")]
[assembly: AssemblyVersion("3.2.18.3")]