diff --git a/compiler/testData/diagnostics/tests/imports/twoImportLists.kt b/compiler/testData/diagnostics/tests/imports/twoImportLists.kt index 83f36c6a5fc..0ffb4c6c457 100644 --- a/compiler/testData/diagnostics/tests/imports/twoImportLists.kt +++ b/compiler/testData/diagnostics/tests/imports/twoImportLists.kt @@ -2,7 +2,7 @@ // FILE:a.kt package a -<<< FOOO +<<< FOOO import b.B //class import b.foo //function import b.ext //extension function @@ -14,7 +14,7 @@ import b.constant.dV import smth.illegal import b.C.smth.illegal -<<<HEAD +<<<HEAD import b.bar.smth import b.bar.* import b.unr.unr.unr