ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-03-10 14:34:27 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update settings.gradle

Browse Source 
Removed merge conflict
This commit is contained in:
Cyrus 2023-05-25 06:40:00 -04:00 committed by GitHub
parent 6931d379b5
commit 10fa9948f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings.gradle
View File

@ -35,14 +35,10 @@ dependencyResolutionManagement {
// library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-web').version('springboot') // library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-web').version('springboot')
// library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-validation').version('springboot') // library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-validation').version('springboot')
library('lombok', 'org.projectlombok:lombok:1.18.26') library('lombok', 'org.projectlombok:lombok:1.18.26')
<<<<<<< HEAD
library('testng', 'org.testng:testng:7.4.0')
=======
// Testing Libraries // Testing Libraries
library('testng', 'org.testng:testng:7.7.1') library('testng', 'org.testng:testng:7.7.1')
library('mockito', 'org.mockito:mockito-core:5.3.1') library('mockito', 'org.mockito:mockito-core:5.3.1')
>>>>>>> 6661a6ca (Checking in updated code. This set does build and load in a rocky)
} }
} }
} }