fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-05-06 16:20:07 -04:00
parent 423045dd56
commit 3e29d73d0c

View File

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