docs(infra): Corrections

[csit.git] / docs / content / infrastructure / fdio_csit_testbed_versioning.md

diff --git a/docs/content/infrastructure/fdio_csit_testbed_versioning.md b/docs/content/infrastructure/fdio_csit_testbed_versioning.md
index 2607dc0..d5af63c 100644 (file)
--- a/docs/content/infrastructure/fdio_csit_testbed_versioning.md
+++ b/docs/content/infrastructure/fdio_csit_testbed_versioning.md
@@ -125,6 +125,12 @@ Following is the list of CSIT versions to date:
   ).
   - Intel NIC 700/800 series firmware upgrade based on DPDK compatibility
     matrix.
+<<<<<<< HEAD   (355ad2 feat(infra): update 3n-alt cx6 iterative tests)
   - Mellanox 556A/MCX713106AS-VEAT series firmware upgrade based on DPDK compatibility
     matrix.
-  - TRex version upgrade: increase from 3.00 to 3.03.
\ No newline at end of file
+  - TRex version upgrade: increase from 3.00 to 3.03.
+=======
+  - Mellanox 556A/CX6-DX/MCX713106AS-VEAT series firmware upgrade based on DPDK
+    compatibility matrix.
+  - TRex version upgrade: increase from 3.00 to 3.03.
+>>>>>>> CHANGE (b5027b docs(infra): Corrections)