Merge branch 'libopencm3' of cu.loc:git/irmp into libopencm3

# Conflicts:
#	irsnd.c

1 files changed, 0 insertions, 1 deletions

diff --git a/irsnd.c b/irsnd.c
index f2508c2..83cc1a0 100644
--- a/irsnd.c
+++ b/irsnd.c
@@ -905,7 +905,6 @@ irsnd_init (void)
         timer_set_oc_mode(IRSND_TIMER, IRSND_TIMER_CHANNEL, TIM_OCM_INACTIVE);

         timer_enable_oc_output(IRSND_TIMER, IRSND_TIMER_CHANNEL);

         timer_enable_break_main_output(IRSND_TIMER);

-

         /* Output polarity and GPIO Configuration */

 #    if 1

         /* (active) high is the default output polarity */