From 7851515c5c749294e82ce20cb23c6d528fb804b5 Mon Sep 17 00:00:00 2001
From: Nicolas Schodet <nico@ni.fr.eu.org>
Date: Tue, 11 Sep 2012 08:15:11 +0200
Subject: [PATCH] Fix merge error

This line was removed in commit acc276a612d4, but it has been restored in the
merge 02ea612142fb.
---
 include/libopencm3/stm32/f1/adc.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h
index b1396a59..116aeaad 100644
--- a/include/libopencm3/stm32/f1/adc.h
+++ b/include/libopencm3/stm32/f1/adc.h
@@ -679,7 +679,6 @@ LGPL License Terms @ref lgpl_license
 
 BEGIN_DECLS
 
-/* TODO */
 void adc_enable_analog_watchdog_regular(u32 adc);
 void adc_disable_analog_watchdog_regular(u32 adc);
 void adc_enable_analog_watchdog_injected(u32 adc);