# Conflicts: # spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt # spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonEncoderTests.kt |
||
---|---|---|
.. | ||
src | ||
spring-tx.gradle |