fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-01-19 14:52:08 -05:00
parent 76bfde2675
commit e951dd20d9

View File

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