diff --git a/model-datastructure/src/commonMain/kotlin/org/modelix/model/LinearHistory.kt b/model-datastructure/src/commonMain/kotlin/org/modelix/model/LinearHistory.kt index f9f6851be9..3e5ce15177 100644 --- a/model-datastructure/src/commonMain/kotlin/org/modelix/model/LinearHistory.kt +++ b/model-datastructure/src/commonMain/kotlin/org/modelix/model/LinearHistory.kt @@ -5,10 +5,6 @@ import org.modelix.model.lazy.IDeserializingKeyValueStore import org.modelix.model.lazy.KVEntryReference import org.modelix.model.persistent.CPVersion -/** - * When merging two branches there might be conflicts between operations that need to be resolved in a deterministic - * way. This class puts them in an order that preserves the order of earlier merges. - */ class LinearHistory(val baseVersionHash: String?) { val version2descendants: MutableMap> = HashMap()