Fix merge conflict.

This commit is contained in:
Marco Vermeulen
2017-03-25 10:25:59 +00:00

View File

@@ -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'
}
}