Autocommit from 2024-06-02 22:06:58

BlackNet · BlackNet · commit 57363a0a3de1 · 2024-06-02T22:06:58.000-04:00
Klipper on commit: 6cd1742

Moonraker on commit: 4fe89d5

Mainsail version: v2.11.2
diff --git a/VOC/chamber_exhaust_fan.cfg b/VOC/chamber_exhaust_fan.cfg
@@ -24,12 +24,3 @@
   # plain sensor from octopus board
   sensor_type: Generic 3950
   sensor_pin: TB
-
-<<<<<<< HEAD
-# plain sensor from octopus board
-sensor_type: Generic 3950
-sensor_pin: TB
-#sensor_pin: NiteHawk:gpio28
-#gcode_id: chamber_th
-=======
->>>>>>> 6ce902cf535e59ca505f69d7b40dd8d6c1974ecb
