fixed conflicts

config/hook_implementations.py

@@ -362,6 +362,29 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
             "Syrlinks Handler: Read LCL config register",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
+<<<<<<< Updated upstream
+=======
+        "15": (
+            "Syrlinks Handler: Set waveform OQPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "16": (
+            "Syrlinks Handler: Set waveform BPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "17": (
+            "Syrlinks Handler: Set second config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "18": (
+            "Syrlinks Handler: Enable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "19": (
+            "Syrlinks Handler: Disable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+>>>>>>> Stashed changes
     }
     service_syrlinks_handler_tuple = (
         "Syrlinks Handler",