From 0b3b41dca70a4d8e996a71aa634b4b17cbe43bbd Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sat, 23 Dec 2023 11:44:15 -0500
Subject: [PATCH] Nullify `TestMergeResult`

---
 .../Components/Repository/TestMergeResult.cs                  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Repository/TestMergeResult.cs b/src/Tgstation.Server.Host/Components/Repository/TestMergeResult.cs
index c722590e30..2505a491d8 100644
--- a/src/Tgstation.Server.Host/Components/Repository/TestMergeResult.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/TestMergeResult.cs
@@ -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; }
 	}
 }