fix merge conflict

release-10.1.0
Luke Pulverenti 7 years ago
parent 4ab9b1dffb
commit 589300a3b0

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

Loading…
Cancel
Save