fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent e76d198a86
commit 895f4a1be4

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

Loading…
Cancel
Save