Fix merge result

11 months ago · c4fe18ca79
1 changed files with 0 additions and 2 deletions
--- 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 {
				@@ -1784,8 +1784,6 @@ class ResolvableTypeTests {
 	public class MyCollectionSuperclassType extends MySuperclassType<Collection<String>> {
 	}

-	public interface Consumer<T> {
-	}

 	public interface Consumer<T> {
 	}