updates clueboard configuration

keyboards/clueboard60/chconf.h

@@ -252,7 +252,7 @@
  *          requirements.
  * @note    Requires @p CH_CFG_USE_MESSAGES.
  */
-#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#define CH_CFG_USE_MESSAGES_PRIORITY        TRUE
 
 /**
  * @brief   Mailboxes APIs.

keyboards/clueboard60/config.h

@@ -28,7 +28,7 @@
 #define USBSTR_MANUFACTURER 'C', '\x00', 'l', '\x00', 'u', '\x00', 'e', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00'
 #define PRODUCT         "Clueboard60"
 #define USBSTR_PRODUCT 'C', '\x00', 'l', '\x00', 'u', '\x00', 'e', '\x00', 'b', '\x00', 'o', '\x00', 'a', '\x00', 'r', '\x00', 'd', '\x00', '6', '\x00', '0', '\x00'
-#define DESCRIPTION     Clueboard 60% PCB
+#define DESCRIPTION     Clueboard 60 PCB
 
 /* key matrix size */
 #define MATRIX_ROWS 5

keyboards/clueboard60/rules.mk

@@ -14,10 +14,7 @@ MCU_SERIES = STM32F3xx
 MCU_LDSCRIPT = STM32F303xC
 
 # Startup code to use
-<<<<<<< HEAD
 #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
-=======
-#  - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
 MCU_STARTUP = stm32f3xx
 
 # Board: it should exist either in <chibios>/os/hal/boards/