fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-02-01 14:21:22 -05:00
parent c48a4cfb99
commit f14e9b8d3a
1 changed files with 1 additions and 1 deletions

View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5818")]
[assembly: AssemblyVersion("3.0.5857")]