fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-12-18 00:44:21 -05:00
parent 54d5b71577
commit 025905a3e4

View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] //[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.0.8500")] [assembly: AssemblyVersion("3.1.259")]