Polishing after merge 4.x

2022-01-17 15:50:18 +01:00
parent a1a3c236d0
commit f054d4534c
4 changed files with 3 additions and 15 deletions
--- a/spring-cloud-function-context/pom.xml
+++ b/spring-cloud-function-context/pom.xml
@@ -46,8 +46,6 @@
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-kotlin</artifactId>
 			<optional>true</optional>
-<<<<<<< HEAD
-=======
 		</dependency>
 		<dependency> 
 			<groupId>javax.annotation</groupId>
@@ -58,7 +56,6 @@
 		    <groupId>javax.activation</groupId>
 		    <artifactId>javax.activation-api</artifactId>
 		    <version>1.2.0</version>
->>>>>>> 4.x
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>