From de9b5695ae02309b882a73be33ed7f633020e664 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 4 Sep 2015 19:57:42 +0300 Subject: [PATCH] fix tests in org.jetbrains.kotlin.cli --- compiler/testData/cli/jvm/conflictingOverloads.out | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/testData/cli/jvm/conflictingOverloads.out b/compiler/testData/cli/jvm/conflictingOverloads.out index f6dc2eb3561..40262f5594f 100644 --- a/compiler/testData/cli/jvm/conflictingOverloads.out +++ b/compiler/testData/cli/jvm/conflictingOverloads.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'internal fun a(): kotlin.List' is already defined in root package +compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.List' is already defined in root package fun a(): List = null!! ^ -compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'internal fun a(): kotlin.List' is already defined in root package +compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.List' is already defined in root package fun a(): List = null!! ^ -COMPILATION_ERROR +COMPILATION_ERROR \ No newline at end of file