Fix merge errors

2 years ago · 0ffdf8d9a7
2 changed files with 2 additions and 1 deletions
--- 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());
 }
--- 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
    {