fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-08-19 16:06:00 -04:00
parent 77d4791dc2
commit 6b077f3f84

View File

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