fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-10-12 15:40:19 -04:00
parent 0fcceecaf6
commit 54cf4cbb44

View File

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