fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent ee06dfbc50
commit dbeea014aa

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

Loading…
Cancel
Save