From 6264b86bbff15958893b8ecdb43dbdd6fbe5e5ab Mon Sep 17 00:00:00 2001
From: Foxies <Foxies-CSTL@users.noreply.github.com>
Date: Thu, 8 Oct 2020 11:14:28 +0200
Subject: [PATCH] Update _Statusscreen.h

---
 Marlin/_Statusscreen.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h
index f5ebc13043..ac4a3b5a1f 100644
--- a/Marlin/_Statusscreen.h
+++ b/Marlin/_Statusscreen.h
@@ -75,6 +75,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 #define STATUS_HEATERS_X      48
 #define STATUS_BED_X          70
 =======
@@ -89,3 +90,7 @@ const unsigned char status_logo_bmp[] PROGMEM = {
 #define STATUS_HEATERS_X      48  //48
 #define STATUS_BED_X          70 //74
 >>>>>>> Stashed changes
+=======
+#define STATUS_HEATERS_X      48  //48
+#define STATUS_BED_X          70 //74
+>>>>>>> Stashed changes