fix merge conflict
This commit is contained in:
parent
345a619d93
commit
7fdd180b20
|
@ -1,4 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.1.*")]
|
[assembly: AssemblyVersion("3.2.1.100")]
|
||||||
[assembly: AssemblyVersion("3.2.0")]
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user