mirror of
https://github.com/sdkman/sdkman-cli.git
synced 2026-01-30 17:23:02 -05:00
Fix merge conflict.
This commit is contained in:
@@ -51,7 +51,7 @@ dependencies {
|
||||
testCompile('org.spockframework:spock-core:0.7-groovy-2.0') {
|
||||
exclude module: 'groovy-all'
|
||||
}
|
||||
testCompile('com.github.tomakehurst:wiremock:2.3.1') {
|
||||
testCompile('com.github.tomakehurst:wiremock:2.5.1') {
|
||||
exclude module: 'junit'
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user