fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-03-08 14:19:30 -05:00
parent d5c7845917
commit 6f6aa075d8

View File

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