From f7a18d3a4ed8efe9c7372e1e8b213d6666d5709f Mon Sep 17 00:00:00 2001
From: Aaron Yourk <ayourk@gmail.com>
Date: Sun, 5 Mar 2017 17:47:51 -0700
Subject: [PATCH] Attempt #2 at resolving conflicts with upstream for pull
 request.

---
 Firmware/ultralcd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0982a958f..b75e09ebe 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -94,10 +94,10 @@ int8_t SDscrool = 0;
 
 int8_t SilentModeMenu = 0;
 
+uint8_t oldFanSpeed = 0;
 int lcd_commands_type=LCD_COMMAND_IDLE;
 int lcd_commands_step=0;
 bool isPrintPaused = false;
-uint8_t oldFanSpeed = 0;
 uint8_t farm_mode = 0;
 int farm_no = 0;
 int farm_timer = 30;