diff --git a/AssemblyInfo.global.cs b/AssemblyInfo.global.cs index 56e3f1eec0..6ca7084733 100644 --- a/AssemblyInfo.global.cs +++ b/AssemblyInfo.global.cs @@ -3,8 +3,8 @@ using System.Runtime.CompilerServices; //You cannot one definition the version number //Believe me, I've tried, the compiler hates it so much -[assembly: AssemblyVersion("3.2.0.5")] -[assembly: AssemblyFileVersion("3.2.0.5")] -[assembly: AssemblyInformationalVersion("3.2.0.5")] +[assembly: AssemblyVersion("3.2.0.6")] +[assembly: AssemblyFileVersion("3.2.0.6")] +[assembly: AssemblyInformationalVersion("3.2.0.6")] [assembly: InternalsVisibleTo("TGS.Tests")] diff --git a/TGS.Server/Instance/Repository.cs b/TGS.Server/Instance/Repository.cs index a34ffc0cbd..7ef2b2215e 100644 --- a/TGS.Server/Instance/Repository.cs +++ b/TGS.Server/Instance/Repository.cs @@ -926,7 +926,7 @@ namespace TGS.Server } //so we'll know if this fails - var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Config.Name)); + var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Environment.NewLine, Config.Name)); if (Result == null) try