fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-02-24 15:18:48 -05:00
parent a3a37f5e86
commit 282934bd53

View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.1.0")] [assembly: AssemblyVersion("3.2.3.1")]