Merge remote-tracking branch 'refs/remotes/origin/master' into dev

d64e5c2b · MagoKimbra · e2cd46e4 · 505aab6a · d64e5c2b
Commit d64e5c2b authored Feb 14, 2016 by MagoKimbra
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

MK_Main.cpp MK/module/MK_Main.cpp +1 -1

No files found.
--- a/MK/module/MK_Main.cpp
+++ b/MK/module/MK_Main.cpp
@@ -8024,7 +8024,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
 void kill(const char* lcd_msg) {
  #if ENABLED(KILL_METHOD) && KILL_METHOD == 1
    HAL::resetHardware();
-  #else
+  #endif

  #if ENABLED(ULTRA_LCD)
    lcd_setalertstatuspgm(lcd_msg);