Remove leaked lines from previous merge in gradle.properties

JPro-one · Jul 11, 2024 · 8567dd5 · 8567dd5
1 parent 1c0f0ac
commit 8567dd5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -21,14 +21,11 @@ FLEXMARK_VERSION = 0.64.8
 JETBRAINS_ANNOTATIONS_VERSION = 24.1.0
 AUTH0_JAVAJWT_VERSION = 4.4.0
 AUTH0_JWKSRSA_VERSION = 0.22.1
-<<<<<<< jpro-mail-module
 JAKARTA_INJECT_VERSION = 2.0.1
 JAKARTA_VALIDATION_VERSION = 3.0.2
 JAKARTA_MAIL_API_VERSION = 2.1.3
 ECLIPSE_ANGUS_MAIL_VERSION = 2.0.3
 ECLIPSE_COLLECTIONS_VERSION = 11.1.0
-=======
->>>>>>> main
 CSSFX_VERSION = 11.5.1
 IKONLI_VERSION = 12.3.1
 ATLANTAFX_VERSION = 2.0.1