mirror of
https://github.com/corda/corda.git
synced 2024-12-20 05:28:21 +00:00
Fixed minor merge conflict.
This commit is contained in:
parent
4c8045d4da
commit
208205e7f4
@ -87,9 +87,6 @@ dependencies {
|
||||
// TypeSafe Config: for simple and human friendly config files.
|
||||
compile "com.typesafe:config:1.3.0"
|
||||
|
||||
// Quasar: for the bytecode rewriting for state machines.
|
||||
quasar "co.paralleluniverse:quasar-core:${quasar_version}:jdk8@jar"
|
||||
|
||||
// Unit testing helpers.
|
||||
testCompile 'junit:junit:4.12'
|
||||
testCompile "org.assertj:assertj-core:${assertj_version}"
|
||||
|
Loading…
Reference in New Issue
Block a user