Merge branch 'refs/heads/maciektr/clippy-fix' into scarb-new-interactive

software-mansion · Jul 26, 2024 · 768f592 · 768f592
2 parents 8e5f407 + d6c764b
commit 768f592
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scarb/src/internal/serdex.rs b/scarb/src/internal/serdex.rs
@@ -32,10 +32,10 @@ impl TryFrom<&str> for MergeStrategy {
 /// If `source` and `target` are tables and a specific key exists in both, the conflict will be
 /// resolved as follows:
 /// 1) If value under the conflicting key in either `source` or `target` is not a table, the value
-/// in `target` will be overridden with the value from `source`. This means that no keys from
-/// subtables under the conflicting key will be preserved.
+///     in `target` will be overridden with the value from `source`. This means that no keys from
+///     subtables under the conflicting key will be preserved.
 /// 2) If values under the conflicting key in both `source` and `target` are tables,
-/// the conflict will be resolved with one of two strategies defined by `source`:
+///     the conflict will be resolved with one of two strategies defined by `source`:
 ///    a) If `source` have a key `merge-strategy` with value `override`, the value in `target` will
 ///     be overridden with the value from `source`.
 ///    b) If `source` have a key `merge-strategy` with value `merge`, the value in `target` will be