fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent 423045dd56
commit 3e29d73d0c

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

Loading…
Cancel
Save