chore: release 2024.12.16 (#3720)

jdx · Dec 21, 2024 · dacbc96 · dacbc96
1 parent dca96d2
commit dacbc96
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/cli/config/set.rs b/src/cli/config/set.rs
@@ -52,11 +52,23 @@ impl ConfigSet {
             let mut container = config.as_item_mut();
             let parts = self.key.split('.').collect::<Vec<&str>>();
             for key in parts.iter().take(parts.len() - 1) {
+<<<<<<< HEAD
                 container = container.as_table_mut().unwrap().entry(key).or_insert({
                     let mut t = toml_edit::Table::new();
                     t.set_implicit(true);
                     toml_edit::Item::Table(t)
                 });
+=======
+                container = container
+                    .as_table_mut()
+                    .unwrap()
+                    .entry(key)
+                    .or_insert({
+                        let mut t = toml_edit::Table::new();
+                        t.set_implicit(true);
+                        toml_edit::Item::Table(t)
+                    });
+>>>>>>> 01bd9dbb2 (fix: use implicit keys for `mise config set`)
             }
             let last_key = parts.last().unwrap();