fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent 59a9bc2881
commit 3a1d2ef5d0

@ -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")]

Loading…
Cancel
Save