Merge branch 'RCBugFix' into RC

thinkyhead · thinkyhead · commit 122bdd187f9d · 2016-03-25T01:15:38.000-07:00
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
@@ -1114,7 +1114,7 @@ static void lcd_control_menu() {
     enqueue_and_echo_command_now(cmd);
   }
 
-#endif PIDTEMP || PIDTEMPBED
+#endif //PIDTEMP || PIDTEMPBED
 
 #if ENABLED(PIDTEMP)
 

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ static void lcd_control_menu() {`
`1114`	`1114`	`enqueue_and_echo_command_now(cmd);`
`1115`	`1115`	`}`
`1116`	`1116`
`1117`		`-#endif PIDTEMP \|\| PIDTEMPBED`
	`1117`	`+#endif //PIDTEMP \|\| PIDTEMPBED`
`1118`	`1118`
`1119`	`1119`	`#if ENABLED(PIDTEMP)`
`1120`	`1120`