update

ursoft · May 9, 2020 · a95b5db · a95b5db
1 parent 7202b53
commit a95b5db
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -432,11 +432,7 @@
 #if (GITHUB_USER==URSOFT)
  #define EXTRUDER_AUTO_FAN_SPEED 100
 #else
-<<<<<<< HEAD
  #define EXTRUDER_AUTO_FAN_SPEED 120   // 255 == full speed было 200
-=======
- #define EXTRUDER_AUTO_FAN_SPEED 200   // 255 == full speed
->>>>>>> parent of 841247218... убрал la понизил скорость кулера на хотенде
 #endif
 #define EXTRUDER_AUTO_FAN_SPEED_CONFIGURABLE
 //#define CHAMBER_AUTO_FAN_TEMPERATURE 30