fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent d5c7845917
commit 6f6aa075d8

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

Loading…
Cancel
Save