fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-02-14 23:17:10 -05:00
parent ddd8a80654
commit 82f4518c55

View File

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