- Resolved conflict (hopefully)

2026-01-20 14:49:36 +01:00
parent 72c1cc39f8
commit 3886524b0e
2 changed files with 0 additions and 18 deletions
--- a/Functions/EQ_structures/ml_mlse.m
+++ b/Functions/EQ_structures/ml_mlse.m
@@ -45,7 +45,6 @@ end

 ml_mlse_results.config = Equalizerstruct();

-<<<<<<< HEAD
 eq_small = strip_eq(eq_, 10);
 fn = fieldnames(eq_small);
 for k = 1:numel(fn)
@@ -54,9 +53,6 @@ for k = 1:numel(fn)
    end
 end
 json_str = jsonencode(eq_small);
-=======
-eq_ = strip_eq(eq_, 10);
->>>>>>> 719e5508e776c18e3dcf72a954c71bdedda179e0

 fn = fieldnames(eq_);
 for k = 1:numel(fn)