fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-29 11:59:37 -04:00
parent 40530f7293
commit 100236f416

View File

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