jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

[DOXYGEN:STM32F3] fix the conflict strings.

Browse Source
This commit is contained in:
BuFran 2013-08-24 17:01:28 +02:00
parent f2febb1b85
commit f04d6dd82b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/stm32/f3/dma.c
View File

@ -2,19 +2,11 @@
* *
* @ingroup STM32F3xx * @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> * @brief <b>libopencm3 STM32F3xx Direct Memory Access</b>
* *
* @version 1.0.0 * @version 1.0.0
* *
* @date 11 July 2013 * @date 11 July 2013
>>>>>>> feadf1f... [STM32F3:doc] Add doxygen documentation page to output
* *
* LGPL License Terms @ref lgpl_license * LGPL License Terms @ref lgpl_license
*/ */