fix merge conflicts

release-10.1.0
Luke Pulverenti 8 years ago
parent ee8c829c5b
commit 4f8684a16b

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

Loading…
Cancel
Save