fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent 6dc8bf9aa1
commit 65db32b1f8

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

Loading…
Cancel
Save