resolved file conflicts

sonic-net · Jan 8, 2024 · d4ade86 · d4ade86
1 parent d7bbe7c
commit d4ade86
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 55 deletions.
diff --git a/Supported-Devices-and-Platforms.html b/Supported-Devices-and-Platforms.html
@@ -1211,6 +1211,14 @@ <h2><p style="text-align: left; font-family: Verdana, sans-serif; color: #2E86C1
 <td></td>
 </tr>
 <tr>
+<td>FS</td>
+<td>S5800-48T4S</td>
+<td class="asic_vendor">Centec</td>
+<td>Centec</td>
+<td>48x1G+4x10G</td>
+<td></td>
+</tr>
+<tr>
 <td>Ragile</td>
 <td>RA-B6920-4S</td>
 <td class="asic_vendor">Broadcom</td>