Minor. Fix rebase

This commit is contained in:
Mikhael Bogdanov
2018-05-29 09:28:46 +02:00
parent 1d6665d355
commit 7f4bd549aa
@@ -223,13 +223,6 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
)
var noExceptionOnExplicitEqualsForBoxedNull by FreezableVar(false)
@Argument(
value = "-Xoutput-imports",
valueDescription = "<path>",
description = "Output imports from all compiled files to the specified file in JSON format"
)
var outputImports: String? by FreezableVar(null)
@Argument(
value = "-Xjvm-default-mode",
valueDescription = "{disable|enable|compatibility}",