ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-20 16:10:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed merge conflicts.

Browse Source
This commit is contained in:
Clinton Alexander
2016-07-07 17:23:14 +01:00
parent d4da633b1e
commit 01e64d3030
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/kotlin/com/r3corda/demos/IRSDemo.kt
View File

@ -462,4 +462,5 @@ private fun printHelp(parser: OptionParser) {
Please refer to the documentation in docs/build/index.html for more info. Please refer to the documentation in docs/build/index.html for more info.
""".trimIndent()) """.trimIndent())
parser.printHelpOn(System.out)
} }

1
src/main/kotlin/com/r3corda/demos/TraderDemo.kt
View File

@ -71,7 +71,6 @@ fun main(args: Array<String>) {
} }
fun runTraderDemo(args: Array<String>): Int { fun runTraderDemo(args: Array<String>): Int {
val cashIssuerKey = generateKeyPair()
val parser = OptionParser() val parser = OptionParser()
val roleArg = parser.accepts("role").withRequiredArg().ofType(Role::class.java).required() val roleArg = parser.accepts("role").withRequiredArg().ofType(Role::class.java).required()