fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-02-16 15:20:48 -05:00
parent b9ce0a3223
commit b42317c0c4

View File

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