Skip to content

Commit 880964b

Browse files
committed
Fixed previous merge failures
1 parent 0ab4018 commit 880964b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/StrictNullChecksTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser
1+
package tools.jackson.module.kotlin.kogeraIntegration.deser
22

33
import com.fasterxml.jackson.annotation.JsonSetter
44
import com.fasterxml.jackson.annotation.Nulls

src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.fasterxml.jackson.module.kotlin.test
1+
package tools.jackson.module.kotlin.test
22

33
import tools.jackson.databind.json.JsonMapper
44
import tools.jackson.module.kotlin.KotlinFeature.StrictNullChecks
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test
1212
import org.junit.jupiter.api.assertThrows
1313
import kotlin.test.assertNull
1414

15-
class StrictNullChecksTest {
15+
class StrictNullChecksTestOld {
1616
private val mapper = JsonMapper.builder()
1717
.addModule(kotlinModule { enable(StrictNullChecks) })
1818
.build()

0 commit comments

Comments
 (0)