fix merge conflict
This commit is contained in:
parent
4c1834c087
commit
7d15b140cf
|
@ -1,3 +1,3 @@
|
|||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyVersion("3.2.36.0")]
|
||||
[assembly: AssemblyVersion("3.2.40.0")]
|
||||
|
|
Loading…
Reference in New Issue
Block a user