fixed minor merging problems
authorbouni <bouni@owee.de>
Thu, 24 Dec 2015 08:47:47 +0000 (09:47 +0100)
committerbouni <bouni@owee.de>
Thu, 24 Dec 2015 08:47:47 +0000 (09:47 +0100)
1  2 
src/modules/tools/spindle/PWMSpindleControl.cpp