Variable spindle output. Resolved conflicts in last push.

Resolve conflicts.
2014-01-04 12:13:49 -07:00 · 2014-01-04 12:13:49 -07:00 · 1baff785f5
commit 1baff785f5
parent 8b5f306851 0104cad56a
1 changed files with 1 additions and 0 deletions
--- a/spindle_control.c
+++ b/spindle_control.c
@ -92,4 +92,5 @@ void spindle_run(int8_t direction, uint16_t rpm)
    current_rpm = rpm;
  }
 }
+
 #endif