From 38685838661551321a1416535acb27afb4212833 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andreas.huber@lucares.de>
Date: Tue, 11 Aug 2020 19:53:44 +0200
Subject: [PATCH] fix merge

---
 build.gradle | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 907340b..d10b2c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,11 +31,7 @@ ext {
     
     lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
     lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.10'
-<<<<<<< HEAD
     lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
-=======
-    lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
->>>>>>> 668f86323eb4efa2f2c5a016e8785958517af07b
     
     lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
     lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
@@ -128,9 +124,5 @@ subprojects {
 }
 
 wrapper {
-<<<<<<< HEAD
     gradleVersion = '6.6'
-=======
-    gradleVersion = '6.4'
->>>>>>> 668f86323eb4efa2f2c5a016e8785958517af07b
 }