fix conflict

QuakeGod

2023-02-22 b6290b94cac76a5634cd90b495b65d91ee92d85e

 Src/debug.c

@@ -173,6 +173,14 @@
            Uart1baudval = HAL_RCC_GetPCLK1Freq() / USART1->BRR;

            Uart1BaudFirstGot=0;

         }

<<<<<<< HEAD
=======
         if (Uart2BaudFirstGot)

         {

            Uart2baudval = HAL_RCC_GetPCLK1Freq() / USART2->BRR;

            Uart2BaudFirstGot=0;

         }		
>>>>>>> 83de2a69af869f4e5c0462a50255317fb9e37099
         int Reload=SysTick->LOAD;



         int Clk2=SysTick->VAL;