Scott Lahteine 6 年之前
父節點
當前提交
321f9140d1
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1
    5
      Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h

+ 1
- 5
Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h 查看文件

@@ -995,11 +995,7 @@
995 995
  * Note that M207 / M208 / M209 settings are saved to EEPROM.
996 996
  *
997 997
  */
998
-<<<<<<< HEAD:Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
999
-#define FWRETRACT  // ONLY PARTIALLY TESTED
1000
-=======
1001
-//#define FWRETRACT
1002
->>>>>>> patch:Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
998
+#define FWRETRACT
1003 999
 #if ENABLED(FWRETRACT)
1004 1000
   #define FWRETRACT_AUTORETRACT           // costs ~500 bytes of PROGMEM
1005 1001
   #if ENABLED(FWRETRACT_AUTORETRACT)

Loading…
取消
儲存