fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-27 15:47:12 -04:00
parent 54886db5e5
commit 9d762c3878

View File

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