fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-28 15:45:17 -04:00
parent 3785298dd9
commit 21a8dc77c3

View File

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