- Resolved conflict (hopefully)

Classes/04_DSP/Timing_Recovery.m

@@ -27,19 +27,11 @@ classdef Timing_Recovery < handle
                 obj.(fn{n}) = options.(fn{n});
             end
 
-<<<<<<< HEAD
             %obj-Initialization here%
 
         end
 
         function [data_out, timing_error] = process(obj, data_in)
-=======
- 
-
-        end
-
-        function [data_out,timing_error] = process(obj, data_in)
->>>>>>> 719e5508e776c18e3dcf72a954c71bdedda179e0
 
             timing_synchronization = comm.SymbolSynchronizer( ...
                 "Modulation",          obj.modulation,...
@@ -48,14 +40,8 @@ classdef Timing_Recovery < handle
                 "DampingFactor",       obj.damping_factor, ...
                 "NormalizedLoopBandwidth", obj.normalized_loop_bandwidth, ...
                 "DetectorGain",        obj.detector_gain);
-<<<<<<< HEAD
             data_out = data_in;
             [data_out.signal, timing_error] = timing_synchronization(data_in.signal);
-=======
-
-            data_out = data_in;
-            [data_out.signal,timing_error] = timing_synchronization(data_in.signal);
->>>>>>> 719e5508e776c18e3dcf72a954c71bdedda179e0
 
         end
     end

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)