fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-09 14:23:12 -04:00
parent 1d14c98ec8
commit 9935397d12

View File

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