Fixed the brief message

harjotsinghpawra · harjotsinghpawra · commit 7c25ccdb2d95 · 2024-07-30T13:37:47.000-07:00
Signed-off-by: Harjot Singh &lt;harjotpawrawork@gmail.com&gt;
diff --git a/doc/VoQ/SAI-Proposal-VoQ-Switch.md b/doc/VoQ/SAI-Proposal-VoQ-Switch.md
@@ -772,7 +772,7 @@ can be queried on each fabric port retrieved from the fabric port list switch at
 ```c
 
 /**
-* @brief Fabric port reachability for all remote reachable switches
+* @brief List of switch id's of all remote reachable switches 
 *
 * @type sai_u16_list_t
 * @flags READ_ONLY
diff --git a/inc/saiport.h b/inc/saiport.h
@@ -2521,21 +2521,20 @@ typedef enum _sai_port_attr_t
     SAI_PORT_ATTR_POE_PORT_ID,
 
     /**
-<<<<<<< HEAD
      * @brief The maximum size of SAI_PORT_ATTR_JSON_FORMATTED_DEBUG_DATA in bytes.
      *
      * @type sai_uint32_t
      * @flags READ_ONLY
      */
     SAI_PORT_ATTR_JSON_FORMATTED_DEBUG_DATA_SIZE,
-=======
-     * @brief Fabric port reachability for all remote reachable switches
+
+    /**
+     * @brief List of switch id's of all remote reachable switches
      *
      * @type sai_u16_list_t
      * @flags READ_ONLY
      */
     SAI_PORT_ATTR_FABRIC_REACHABILITY_LIST,
->>>>>>> 18136be (Adding support to get a list of all reachable switch-id's from a fabric port)
 
     /**
      * @brief End of attributes

Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ can be queried on each fabric port retrieved from the fabric port list switch at`
`772`	`772`	```c
`773`	`773`
`774`	`774`	`/**`
`775`		`-* @brief Fabric port reachability for all remote reachable switches`
	`775`	`+* @brief List of switch id's of all remote reachable switches`
`776`	`776`	`*`
`777`	`777`	`* @type sai_u16_list_t`
`778`	`778`	`* @flags READ_ONLY`