Skip to content

Commit 46a452e

Browse files
author
apatrida
committed
fix bad merge doubling of function
1 parent 4e456db commit 46a452e

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ class KotlinModule(val reflectionCacheSize: Int = 512, val nullToEmptyCollection
4646
// [module-kotlin#225]: keep Kotlin singletons as singletons
4747
context.addBeanDeserializerModifier(KotlinBeanDeserializerModifier)
4848

49-
fun addMixIn(clazz: Class<*>, mixin: Class<*>) {
50-
context.setMixInAnnotations(clazz, mixin)
51-
}
52-
5349
context.insertAnnotationIntrospector(KotlinAnnotationIntrospector(context, cache, nullToEmptyCollection, nullToEmptyMap))
5450
context.appendAnnotationIntrospector(KotlinNamesAnnotationIntrospector(this, cache))
5551

0 commit comments

Comments
 (0)