fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-05-12 14:18:42 -04:00
parent 6dc8bf9aa1
commit 65db32b1f8

View File

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