fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-05-15 00:34:16 -04:00
parent feb3654bf1
commit e208576329

View File

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