andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

fix merge

Browse Source
This commit is contained in:
Andreas Huber
2020-08-11 19:53:44 +02:00
parent 5b55badfea
commit 3868583866
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -31,11 +31,7 @@ ext {
lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4' lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.10' 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.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_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}" lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
@@ -128,9 +124,5 @@ subprojects {
} }
wrapper { wrapper {
<<<<<<< HEAD
gradleVersion = '6.6' gradleVersion = '6.6'
=======
gradleVersion = '6.4'
>>>>>>> 668f86323eb4efa2f2c5a016e8785958517af07b
} }