fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-01-06 12:21:01 -05:00
parent 59a9bc2881
commit 3a1d2ef5d0

View File

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