From c4fe18ca79f951c22d311b96aa35fa253093b5e2 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Wed, 15 Jan 2025 18:31:16 +0100
Subject: [PATCH] Fix merge result

---
 .../test/java/org/springframework/core/ResolvableTypeTests.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
index 419e3b52c2..29db287ee8 100644
--- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
@@ -1784,8 +1784,6 @@ class ResolvableTypeTests {
 	public class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
 	}
 
-	public interface Consumer<T> {
-	}
 
 	public interface Consumer<T> {
 	}