fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-02-06 01:08:09 -05:00
parent b40250045a
commit 84d2a5303b

View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.5")]
[assembly: AssemblyVersion("3.1.295")]