From 638bac84cf7f49e6ebefa37240c48f7c78553bb8 Mon Sep 17 00:00:00 2001
From: InsanityAutomation <d.menzel@insanityautomation.com>
Date: Wed, 22 Jul 2020 21:31:39 -0400
Subject: [PATCH] Update Creality_DWIN.cpp

---
 Marlin/src/lcd/extui/lib/Creality_DWIN.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp
index 5c684882cb..79694cbc95 100644
--- a/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extui/lib/Creality_DWIN.cpp
@@ -1511,12 +1511,9 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
       if (recdat.data[0] == 1) //Filament is out, resume / resume selected on screen
       {
         if(
-<<<<<<< HEAD
           #if (FIL_RUNOUT_STATE == LOW)
             #define FIL_RUNOUT_INVERTING true
           #endif
-=======
->>>>>>> Rebase and catchup
         #if DISABLED(FILAMENT_RUNOUT_SENSOR) || ENABLED(FILAMENT_MOTION_SENSOR)
           true
         #elif NUM_RUNOUT_SENSORS > 1