From a1c5d9ee88d54500873b3440ab3a2579a8f538e4 Mon Sep 17 00:00:00 2001
From: sergeych <real.sergeych@gmail.com>
Date: Thu, 23 Mar 2023 18:38:26 +0100
Subject: [PATCH] removed conflict data from blocks as it is not needed and not
 yet implemented

---
 build.gradle.kts                                 |  2 +-
 .../kotlin/net.sergeych.merge3/merge3.kt         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

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<T> {
      */
     data class Resolved<T>(override val data: List<T>) : MergedBlock<T>()
 
-    /**
-     * 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<T>(val variantA: List<T>, val variantB: List<T>) : MergedBlock<T>() {
-        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<T>(val variantA: List<T>, val variantB: List<T>) : MergedBlock<T>() {
+//        override val data = variantA + variantB
+//    }
 }