fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-08-13 16:20:51 -04:00
parent 655cec52c4
commit f6ed934a7e

View File

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