From 0ffdf8d9a7c729dd831e1da15d7e344c14dce692 Mon Sep 17 00:00:00 2001
From: Ynse Hoornenborg <github@ynse.nl>
Date: Tue, 25 Jun 2024 00:22:10 +0200
Subject: [PATCH] Fix merge errors

---
 src/ImageSharp/Configuration.cs      | 2 +-
 tests/ImageSharp.Tests/TestImages.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index b2d1cb04b..228e42bfe 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -227,7 +227,7 @@ public sealed class Configuration
             new TiffConfigurationModule(),
             new WebpConfigurationModule(),
             new QoiConfigurationModule(),
-            new HeifConfigurationModule());
+            new HeifConfigurationModule(),
             new IcoConfigurationModule(),
             new CurConfigurationModule());
 }
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 99789ecd6..9fc7ffe32 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -1138,6 +1138,7 @@ public static class TestImages
         public const string IrvineAvif = "Heif/Irvine_CA.avif";
 
         public const string XnConvert = "Heif/jpeg444_xnconvert.avif";
+    }
 
     public static class Ico
     {