fix merge conflict

release-10.1.0
Luke Pulverenti 7 years ago
parent 4c1834c087
commit 7d15b140cf

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.36.0")] [assembly: AssemblyVersion("3.2.40.0")]

Loading…
Cancel
Save