resolve merge conflicts

2019-10-06 20:08:55 +02:00
parent 6de9a1ba97 7cbe9ac12c
commit 2d02097aff
2409 changed files with 22044 additions and 12068 deletions
--- a/spring-core-3/pom.xml
+++ b/spring-core-3/pom.xml
@@ -29,6 +29,11 @@
            <artifactId>spring-core</artifactId>
            <version>${spring.version}</version>
        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-engine</artifactId>