fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-04-30 23:41:41 -04:00
parent 297cbb2610
commit 724aa4af40

View File

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