resolving conflicts after rebasing main into migue/fetch-mark-index

automerge · Jun 11, 2024 · 1834d62 · 1834d62
1 parent 5f47e26
commit 1834d62
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/rust/src/mark.rs b/rust/src/mark.rs
@@ -1,6 +1,6 @@
 use automerge as am;
 
-use crate::ScalarValue;
+use crate::{ScalarValue, Value};
 
 pub enum ExpandMark {
     Before,
@@ -51,9 +51,7 @@ impl KeyValue {
                 start: index,
                 end: index,
                 name: key.to_string(),
-                value: Value::Scalar {
-                    value: value.into(),
-                },
+                value: value.into(),
             };
             result.push(mark);
         }