fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent 40530f7293
commit 100236f416

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

Loading…
Cancel
Save