fix merge conflict
This commit is contained in:
parent
3785298dd9
commit
21a8dc77c3
|
@ -1,4 +1,4 @@
|
|||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.1.*")]
|
||||
[assembly: AssemblyVersion("3.1.126")]
|
||||
[assembly: AssemblyVersion("3.1.*")]
|
||||
//[assembly: AssemblyVersion("3.0.6060")]
|
||||
|
|
Loading…
Reference in New Issue
Block a user