fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent a3a37f5e86
commit 282934bd53

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

Loading…
Cancel
Save