fix merge conflicts

This commit is contained in:
Luke Pulverenti
2017-07-23 02:11:54 -04:00
parent 975a973d31
commit e99bc61d53
2 changed files with 12 additions and 8 deletions

View File

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