fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-22 16:47:35 -04:00
parent 9012759769
commit 821d673111

View File

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