Bring up to date with master

1 files changed, 0 insertions, 3 deletions

diff --git a/src/portable/synopsys/dwc2/dwc2_stm32.h b/src/portable/synopsys/dwc2/dwc2_stm32.h
index ca5ce5a7c..08950ccc0 100644
--- a/src/portable/synopsys/dwc2/dwc2_stm32.h
+++ b/src/portable/synopsys/dwc2/dwc2_stm32.h
@@ -249,14 +249,11 @@ static inline void dwc2_phy_init(dwc2_regs_t* dwc2, uint8_t hs_phy_type) {
 
       // Enable PLL internal PHY
       USB_HS_PHYC->USB_HS_PHYC_PLL |= USB_HS_PHYC_PLL_PLLEN;
-<<<<<<< HEAD
 
       // Wait ~2ms until the PLL is ready (there's no RDY bit to query)
       tusb_time_delay_ms_api(2);
       #else
 
-=======
->>>>>>> 246a92c65 (It worksgit status!)
       #endif
     }
   }