Fix merge result

jhoeller · jhoeller · commit c4fe18ca79f9 · 2025-01-15T18:31:16.000+01:00
diff --git 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 @@ public class MySimpleSuperclassType extends MySuperclassType<String> {
 	public class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
 	}
 
-	public interface Consumer<T> {
-	}
 
 	public interface Consumer<T> {
 	}

Original file line number	Diff line number	Diff line change
`@@ -1784,8 +1784,6 @@ public class MySimpleSuperclassType extends MySuperclassType<String> {`
`1784`	`1784`	`public class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {`
`1785`	`1785`	`}`
`1786`	`1786`
`1787`		`- public interface Consumer<T> {`
`1788`		`- }`
`1789`	`1787`
`1790`	`1788`	`public interface Consumer<T> {`
`1791`	`1789`	`}`