fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-02-24 15:21:00 -05:00
parent 5d5f4162eb
commit c07e774ca9

View File

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