Rectify conflicts

FreeRTOS · Sep 13, 2024 · 2382195 · 2382195
1 parent 5c3524e
commit 2382195
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/source/core_mqtt.c b/source/core_mqtt.c
@@ -2815,24 +2815,10 @@ MQTTStatus_t MQTT_Connect( MQTTContext_t * pContext,
 
         if( status == MQTTSuccess )
         {
-<<<<<<< HEAD
-            /* Clear any existing records if a new session is established. */
-            ( void ) memset( pContext->outgoingPublishRecords,
-                             0x00,
-                             pContext->outgoingPublishRecordMaxCount * sizeof( *pContext->outgoingPublishRecords ) );
-        }
-
-        if( ( *pSessionPresent != true ) && ( pContext->incomingPublishRecordMaxCount > 0U ) )
-        {
-            ( void ) memset( pContext->incomingPublishRecords,
-                             0x00,
-                             pContext->incomingPublishRecordMaxCount * sizeof( *pContext->incomingPublishRecords ) );
-=======
             status = sendConnectWithoutCopy( pContext,
                                              pConnectInfo,
                                              pWillInfo,
                                              remainingLength );
->>>>>>> 62d8f5a (Implement critical section without mutexTaken flag)
         }
 
         /* Read CONNACK from transport layer. */