From eebe08fa63c09939fe77eb89d1bc08813b9405c3 Mon Sep 17 00:00:00 2001
From: Brian Popow <popow@gmx.de>
Date: Fri, 29 Jan 2021 21:24:25 +0100
Subject: [PATCH] Fix conflict resolution mistake: Configuration was declared
 twice

---
 src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
index 80d5108dd..a3571388b 100644
--- a/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
+++ b/src/ImageSharp/Formats/Tiff/TiffDecoderCore.cs
@@ -19,11 +19,6 @@ namespace SixLabors.ImageSharp.Formats.Experimental.Tiff
     /// </summary>
     internal class TiffDecoderCore : IImageDecoderInternals
     {
-        /// <summary>
-        /// The global configuration.
-        /// </summary>
-        private readonly Configuration configuration;
-
         /// <summary>
         /// Used for allocating memory during processing operations.
         /// </summary>