fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-03 20:24:41 -04:00
parent 3be72e195e
commit ac62ba9e19

View File

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