fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-08-15 23:38:25 -04:00
parent 8bd3b9f8d8
commit 19c3ad643c

View File

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