Autocommit from 2025-02-08 16:52:20

Klipper on commit: 0114d72

Moonraker on commit: 7e3c86e

Mainsail version: v2.13.2

Author: BlackNet

printer.cfg

@@ -1,19 +1,11 @@
-<<<<<<< HEAD
-[include mmu/base/*.cfg]
-=======
 #[include mmu/base/*.cfg]
->>>>>>> d384cc171d9f2f6cedb19a4b36ddddc32ce95589
 #[include mmu/addons/blobifier.cfg]
 #[include mmu/addons/mmu_erec_cutter.cfg]
 
 #[mcu MMBv2]
 #canbus_uuid: cc0d95cbd610
 ###fa6cb4652cba
 
-<<<<<<< HEAD
-=======
-
->>>>>>> d384cc171d9f2f6cedb19a4b36ddddc32ce95589
 # this is for the small displays
 
 [include fluidd.cfg]