Update Creality_DWIN.cpp

2020-07-22 21:31:39 -04:00
parent f7eaa32bc9
commit 29899e6fe8
1 changed files with 0 additions and 3 deletions
@@ -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