< ron> You have a PR with merge conflicts <https github com kotlinlang #tornadofx

<@U14ECM2KV> You have a PR with merge conflicts: <...

edvin

03/10/2017, 8:15 PM

@ron You have a PR with merge conflicts: https://github.com/edvin/fxlauncher/pull/58 - It might be because I merged the HeadlessLauncher.