fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-02 17:50:58 -04:00
parent 7a39ce558a
commit db99a9840b

View File

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