fix merge conflict
This commit is contained in:
parent
96f6985b4b
commit
0be3fdc062
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.0.*")]
|
[assembly: AssemblyVersion("3.0.*")]
|
||||||
[assembly: AssemblyVersion("3.0.5921")]
|
//[assembly: AssemblyVersion("3.0.5911")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user