fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-05 02:13:19 -04:00
parent 295d47a487
commit 8cca5dfb03

View File

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