fix merge conflict
This commit is contained in:
parent
ba1b7603eb
commit
4679f0aed6
|
@ -1,4 +1,4 @@
|
|||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.0.*")]
|
||||
//[assembly: AssemblyVersion("3.0.5781.4")]
|
||||
//[assembly: AssemblyVersion("3.0.*")]
|
||||
[assembly: AssemblyVersion("3.0.5781.5")]
|
||||
|
|
Loading…
Reference in New Issue
Block a user