Fix restyle

Author: raul-marquez-csa

src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml

@@ -91,10 +91,6 @@ tests:
               type: list
               contains: [2]
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 96f57e6431 (Revert tests)
     #Issue https://github.com/project-chip/connectedhomeip/issues/31551
     - label:
           "Step 4c: TH reads the Feature dependent attribute(DEPONOFF) in
@@ -107,11 +103,6 @@ tests:
               type: list
               contains: [3]
 
-<<<<<<< HEAD
-=======
->>>>>>> 3b0149b454 (Modifed YAML tests:)
-=======
->>>>>>> 96f57e6431 (Revert tests)
     - label: "Step 5: TH reads from the DUT the EventList attribute."
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"

src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_8.yaml

@@ -56,7 +56,6 @@ tests:
           "Step 3: TH sends a ActivateTextTrack command to DUT specifying the ID
           value from step 2"
       PICS: MEDIAPLAYBACK.S.C0d.Rsp
-<<<<<<< HEAD
       verification: |
           ./chip-tool mediaplayback activate-text-track activeTextTrackId_1 1 3
 
@@ -111,21 +110,12 @@ tests:
           [1705920471.994181][14352:14354] CHIP:DMG: }
           [1705920471.994472][14352:14354] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0506 Attribute 0x0000_0009 DataVersion: 402582000
           [1705920471.994741][14352:14354] CHIP:TOO:   ActiveTextTrack: {
-<<<<<<< HEAD
-<<<<<<< HEAD
           [1705920471.994789][14352:14354] CHIP:TOO:     Id:
-=======
-          [1705920471.994789][14352:14354] CHIP:TOO:     Id: 
->>>>>>> 63e71b1733 (Fixes issue: 109, 110, 111, 112, 113, 114, 115, 116)
-=======
-          [1705920471.994789][14352:14354] CHIP:TOO:     Id:
->>>>>>> 25dcd3aacf (Restyled by whitespace)
           [1705920471.994845][14352:14354] CHIP:TOO:     TrackAttributes: null
           [1705920471.994886][14352:14354] CHIP:TOO:    }
           [1705920471.995254][14352:14354] CHIP:EM: <<< [E:930i S:17726 M:66812520 (Ack:87654763)] (S) Msg TX to 1:0000000000000001 [D27C] [UDP:[fe80::e65f:1ff:fe0f:19ff%wlan0]:5640] --- Type 0000:10 (SecureChannel:StandaloneAck)
           [1705920471.995502][14352:14354] CHIP:EM: Flushed pending ack for MessageCounter:87654763 on exchange 930i
       disabled: true
-=======
       command: "ActivateTextTrack"
       arguments:
           values:
@@ -149,4 +139,3 @@ tests:
       attribute: "ActiveTextTrack"
       response:
           value: { ID: "", TrackAttributes: null }
->>>>>>> upstream/master