fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-09-09 15:41:49 -04:00
parent 27df3ac19b
commit ecc1ac78bb

View File

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