resolve merge conflict

8 years ago · 5302cd5b20
parent 85370b847a
commit 5302cd5b20
1 changed files with 1 additions and 1 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,3 +1,3 @@
 using System.Reflection;

-[assembly: AssemblyVersion("3.2.34.0")]
+[assembly: AssemblyVersion("3.2.34.2")]