fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-05-25 13:05:06 -04:00
parent 9120acca43
commit 4aebdad4f7

View File

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