Followup to #11904

6 years ago · 321f9140d1
parent 23114aeb81
commit 321f9140d1
1 changed files with 1 additions and 5 deletions
--- 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)