cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 21:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nullify TestMergeResult

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-23 11:44:15 -05:00
parent 3f758bb560
commit 0b3b41dca7
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Repository/TestMergeResult.cs
+1 -3
View File
@@ -2,8 +2,6 @@
using LibGit2Sharp;
#nullable disable
namespace Tgstation.Server.Host.Components.Repository
{
/// <summary>
@@ -19,6 +17,6 @@ namespace Tgstation.Server.Host.Components.Repository
/// <summary>
/// List of conflicting file paths relative to the repository root. Only present if <see cref="Status"/> is <see cref="MergeStatus.Conflicts"/>.
/// </summary>
public IReadOnlyList<string> ConflictingFiles { get; init; }
public IReadOnlyList<string>? ConflictingFiles { get; init; }
}
}