merged

2015-02-14 19:28:58 +01:00
parent 655f9021e6
commit 53d707f5ef
1 changed files with 4 additions and 0 deletions
--- a/TeensyPwm.cpp
+++ b/TeensyPwm.cpp
@ -10,7 +10,11 @@



+<<<<<<< local
+volatile float U_des = 12.0;
+=======
 volatile float u_des = 14.0;
+>>>>>>> other