- fixed incorrectly checked file

AtlasOfLivingAustralia · May 10, 2024 · a1066f5 · a1066f5
1 parent 8ae0db6
commit a1066f5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -146,11 +146,7 @@ dependencies {
     implementation ("org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion")
     implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
     implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
-<<<<<<< HEAD
-    runtimeOnly "org.grails.plugins:ala-bootstrap3:4.2.0"
-=======
     runtimeOnly "org.grails.plugins:ala-bootstrap3:4.4.0"
->>>>>>> master
 
     //    swagger API
     implementation 'au.org.ala.plugins:openapi:1.1.0'