[DOXYGEN:STM32F3] fix the conflict strings.

11 years ago · f04d6dd82b
1 changed files with 0 additions and 8 deletions
--- a/lib/stm32/f3/dma.c
+++ b/lib/stm32/f3/dma.c
@ -2,19 +2,11 @@
 *
 * @ingroup STM32F3xx
 *
-<<<<<<< HEAD
- * @brief <b>libopencm3 STM32F3xx DMA</b>
- *
- * @version 1.0.0
- *
- * @date 10 July 2013
-=======
 * @brief <b>libopencm3 STM32F3xx Direct Memory Access</b>
 *
 * @version 1.0.0
 *
 * @date 11 July 2013
->>>>>>> feadf1f... [STM32F3:doc] Add doxygen documentation page to output
 *
 * LGPL License Terms @ref lgpl_license
 */