From 53d707f5ef6223a75be05255c62e28f0951e8115 Mon Sep 17 00:00:00 2001 From: wn Date: Sat, 14 Feb 2015 19:28:58 +0100 Subject: [PATCH] merged --- TeensyPwm.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TeensyPwm.cpp b/TeensyPwm.cpp index ef7516d..219168f 100644 --- a/TeensyPwm.cpp +++ b/TeensyPwm.cpp @@ -10,7 +10,11 @@ +<<<<<<< local +volatile float U_des = 12.0; +======= volatile float u_des = 14.0; +>>>>>>> other