fix merge conflict

8 years ago · 84d2a5303b
parent b40250045a
commit 84d2a5303b
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.1.*")]
-[assembly: AssemblyVersion("3.1.5")]
+[assembly: AssemblyVersion("3.1.295")]