fix merge conflicts

This commit is contained in:
Luke Pulverenti 2017-08-27 13:34:42 -04:00
parent ee8c829c5b
commit 4f8684a16b

View File

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