From e2a546ca0b73f61c5470568782d5e75e408361cd Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Tue, 11 Sep 2018 18:32:27 +0300 Subject: [PATCH] Fix merge conflict. --- runtime/src/main/kotlin/kotlin/Any.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runtime/src/main/kotlin/kotlin/Any.kt b/runtime/src/main/kotlin/kotlin/Any.kt index e060aa8ef70..73b59d7310b 100644 --- a/runtime/src/main/kotlin/kotlin/Any.kt +++ b/runtime/src/main/kotlin/kotlin/Any.kt @@ -50,6 +50,4 @@ public open class Any { @PublishedApi @SymbolName("Kotlin_Any_hashCode") -external internal fun Any.identityHashCode(): Int - -public fun Any?.hashCode() = if (this != null) this.hashCode() else 0 \ No newline at end of file +external internal fun Any.identityHashCode(): Int \ No newline at end of file