fix merge conflict

release-10.1.0
Luke Pulverenti 8 years ago
parent 655cec52c4
commit f6ed934a7e

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

Loading…
Cancel
Save