Update build.gradle

reta · May 6, 2024 · 0d089e7 · 0d089e7
1 parent ce40003
commit 0d089e7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -598,11 +598,7 @@ dependencies {
     runtimeOnly 'com.eclipsesource.minimal-json:minimal-json:0.9.5'
     runtimeOnly 'commons-codec:commons-codec:1.17.0'
     runtimeOnly 'org.cryptacular:cryptacular:1.2.6'
-<<<<<<< HEAD
-    compileOnly 'com.google.errorprone:error_prone_annotations:2.26.1'
-=======
     compileOnly 'com.google.errorprone:error_prone_annotations:2.27.1'
->>>>>>> e3803d9c (Bump com.google.errorprone:error_prone_annotations from 2.27.0 to 2.27.1 (#4323))
     runtimeOnly 'com.sun.istack:istack-commons-runtime:4.2.0'
     runtimeOnly 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
     runtimeOnly 'org.ow2.asm:asm:9.6'