fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-07-01 12:23:46 -04:00
parent 91a7b7036e
commit fad71a6c7d

View file

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