From b24623810e4929fbd17fd4d60cb015f3b3e3cb65 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <Dmitry.Petrov@jetbrains.com>
Date: Mon, 12 Oct 2015 18:17:23 +0300
Subject: [PATCH] Java 8 and Any-related restrictions: fix commits clash in
 testData

---
 .../diagnostics/tests/java8Overrides/implementingMethodOfAny.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.kt b/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.kt
index 4f5a06bb33b..49d17cc114a 100644
--- a/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.kt
+++ b/compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.kt
@@ -1,7 +1,7 @@
 interface IA {
     <!METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE!>override fun toString(): String = "IA"<!>
 
-    <!METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE!>override fun equals(other: Any?): Boolean = <!SUPERCLASS_NOT_ACCESSIBLE_FROM_TRAIT!>super<!>.equals(other)<!>
+    <!METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE!>override fun equals(other: Any?): Boolean = <!SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE!>super<!>.equals(other)<!>
 
     <!METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE!>override fun hashCode(): Int {
         return 42;