From 321f9140d13fe1f3c2eba69b577fcc1f476bd559 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 28 Sep 2018 20:04:31 -0500 Subject: [PATCH] Followup to #11904 --- .../src/config/examples/Formbot/Raptor/Configuration_adv.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index ab9d929486..093c59990b 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -995,11 +995,7 @@ * Note that M207 / M208 / M209 settings are saved to EEPROM. * */ -<<<<<<< HEAD:Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h -#define FWRETRACT // ONLY PARTIALLY TESTED -======= -//#define FWRETRACT ->>>>>>> patch:Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h +#define FWRETRACT #if ENABLED(FWRETRACT) #define FWRETRACT_AUTORETRACT // costs ~500 bytes of PROGMEM #if ENABLED(FWRETRACT_AUTORETRACT)