fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent 70f48f9cea
commit f54ed74837

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] //[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.0")] [assembly: AssemblyVersion("3.1.260")]

Loading…
Cancel
Save