cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 06:27:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #359 from tgstation/Cyberboss-patch-1

Browse Source 
Fixes pull request merging
This commit is contained in:
Jordan Brown
2017-11-13 12:18:36 -05:00
committed by GitHub
parent 20adbc7e1a 7d2d407da7
commit 4dfb09edd1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGServerService/ServerInstance/Repository.cs
+1 -1
View File
@@ -928,7 +928,7 @@ namespace TGServerService
}
//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