fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-03-31 12:44:02 -04:00
parent 96f6985b4b
commit 0be3fdc062

View File

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