diff --git a/build.gradle.kts b/build.gradle.kts index 6462c3c..b5dab57 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "net.sergeych" -version = "0.0.3-SNAPSHOT" +version = "0.0.4-SNAPSHOT" repositories { mavenCentral() diff --git a/src/commonMain/kotlin/net.sergeych.merge3/merge3.kt b/src/commonMain/kotlin/net.sergeych.merge3/merge3.kt index d223b1b..9957bfd 100644 --- a/src/commonMain/kotlin/net.sergeych.merge3/merge3.kt +++ b/src/commonMain/kotlin/net.sergeych.merge3/merge3.kt @@ -60,14 +60,14 @@ sealed class MergedBlock { */ data class Resolved(override val data: List) : MergedBlock() - /** - * The portion of data that can't be merged due to the conflicting changes. - * __Note it is not yet used.__ - */ - @Suppress("unused") - data class Conflict(val variantA: List, val variantB: List) : MergedBlock() { - override val data = variantA + variantB - } +// /** +// * The portion of data that can't be merged due to the conflicting changes. +// * __Note it is not yet used.__ +// */ +// @Suppress("unused") +// data class Conflict(val variantA: List, val variantB: List) : MergedBlock() { +// override val data = variantA + variantB +// } }