fix merge conflicts

pull/1154/head
Luke Pulverenti 8 years ago
parent 885d1f55a6
commit 5dca8cb077

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

Loading…
Cancel
Save