From b6290b94cac76a5634cd90b495b65d91ee92d85e Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期三, 22 二月 2023 08:57:38 +0800
Subject: [PATCH] fix conflict

---
 Inc/stm32f0xx_it.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Inc/stm32f0xx_it.h b/Inc/stm32f0xx_it.h
index c93dbd8..170bd54 100644
--- a/Inc/stm32f0xx_it.h
+++ b/Inc/stm32f0xx_it.h
@@ -52,6 +52,8 @@
 void SVC_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void TIM6_IRQHandler(void);
+void SPI1_IRQHandler(void);
 void DMA1_Channel2_3_IRQHandler(void);
 void DMA1_Channel4_5_IRQHandler(void);
 void USART1_IRQHandler(void);

--
Gitblit v1.9.1