ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up failed merge

pull/1501/head
Steven Cooreman 2016-01-13 09:57:38 +01:00
parent b515defdd4
commit 9d35328001
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/mbed/targets/cmsis/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32PG_STK3401/TOOLCHAIN_GCC_ARM/startup_efm32pg1b.S
View File

@ -113,11 +113,7 @@ __Vectors:
.long PCNT0_IRQHandler /* 22 - PCNT0 */
.long CMU_IRQHandler /* 23 - CMU */
.long MSC_IRQHandler /* 24 - MSC */
<<<<<<< HEAD
.long Default_Handler /* 25 - Reserved */
=======
.long CRYPTO_IRQHandler /* 25 - CRYPTO */
>>>>>>> SiLabs: Update emlib to 4.2.0
.long LETIMER0_IRQHandler /* 26 - LETIMER0 */
.long Default_Handler /* 27 - Reserved */
.long Default_Handler /* 28 - Reserved */