fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-03-29 02:25:24 -04:00
parent 04dc04298b
commit 75f58d5665

View File

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