azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict.

Browse Source
This commit is contained in:
Nikolay Igotti
2018-09-11 18:32:27 +03:00
parent 996ec4a6fd
commit e2a546ca0b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/kotlin/kotlin/Any.kt
+1 -3
View File
@@ -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
external internal fun Any.identityHashCode(): Int