From 2272116905c572ec0487e38eb9d376fa2e2f5bf5 Mon Sep 17 00:00:00 2001
From: Przemek Grondek <pgrondek@gmail.com>
Date: Fri, 25 Nov 2022 10:51:30 +0100
Subject: [PATCH] 2022.11.25 10:51

---
 print/QUALITY - 0.20mm.ini                        | 4 ++--
 printer/Original Prusa i3 MK3S & MK3S+ MMU2S_.ini | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/print/QUALITY - 0.20mm.ini b/print/QUALITY - 0.20mm.ini
index c982f1c..ddacb5e 100644
--- a/print/QUALITY - 0.20mm.ini	
+++ b/print/QUALITY - 0.20mm.ini	
@@ -1,4 +1,4 @@
-# generated by PrusaSlicer 2.5.0+linux-x64-GTK3 on 2022-11-15 at 11:26:51 UTC
+# generated by PrusaSlicer 2.5.0+linux-x64-GTK3 on 2022-11-23 at 13:39:48 UTC
 avoid_crossing_perimeters = 0
 avoid_crossing_perimeters_max_detour = 0
 bottom_fill_pattern = monotonic
@@ -41,7 +41,7 @@ fuzzy_skin_point_dist = 0.8
 fuzzy_skin_thickness = 0.3
 gap_fill_enabled = 1
 gap_fill_speed = 40
-gcode_comments = 0
+gcode_comments = 1
 gcode_label_objects = 1
 gcode_resolution = 0.0125
 gcode_substitutions = 
diff --git a/printer/Original Prusa i3 MK3S & MK3S+ MMU2S_.ini b/printer/Original Prusa i3 MK3S & MK3S+ MMU2S_.ini
index 5a235f8..55e8802 100644
--- a/printer/Original Prusa i3 MK3S & MK3S+ MMU2S_.ini	
+++ b/printer/Original Prusa i3 MK3S & MK3S+ MMU2S_.ini	
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # generated by PrusaSlicer 2.5.0+linux-x64-GTK3 on 2022-11-21 at 23:12:41 UTC
+=======
+# generated by PrusaSlicer 2.5.0+linux-x64-GTK3 on 2022-11-23 at 13:38:50 UTC
+>>>>>>> c0e38c1 (2022.11.24 18:03)
 bed_custom_model = 
 bed_custom_texture = 
 bed_shape = 0x0,250x0,250x210,0x210