fix merge conflict

9 years ago · 736e632410
parent 4a7df961dc
commit 736e632410
1 changed files with 1 additions and 1 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;

 //[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5882")]
+[assembly: AssemblyVersion("3.0.5920")]