Merge from current master. Fixed a compilation error with the GNUC toolchain

2021-06-29 00:43:41 +02:00
parent cb0f1d98db
commit 36ba9608bd
2 changed files with 8 additions and 10 deletions
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -113,11 +113,8 @@

 // Renesas RX
 #define OPT_MCU_RX63X            1400 ///< Renesas RX63N/631
-<<<<<<< HEAD
-#define OPT_MCU_RX72N            1401 ///< Renesas RX72N
-=======
 #define OPT_MCU_RX65X            1401 ///< Renesas RX65N/RX651
->>>>>>> origin/master
+#define OPT_MCU_RX72N            1402 ///< Renesas RX72N

 // Mind Motion
 #define OPT_MCU_MM32F327X        1500 ///< Mind Motion MM32F327