fix merge conflict

release-10.1.0
Luke Pulverenti 8 years ago
parent 5d5f4162eb
commit c07e774ca9

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

Loading…
Cancel
Save