fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-27 16:41:54 -05:00
parent 6eb5d34af1
commit 03118de6b7

View File

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