3DPrinting/prusa-slicer-profiles
1
0
Fork 0
mirror of https://github.com/pgrondek/prusa-slicer-profiles.git synced 2025-01-22 14:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix after rebase

Browse source
This commit is contained in:
Przemek Grondek 2022-11-25 10:52:23 +01:00
parent 2f10729b62
commit 5ebde7f529
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
printer/.Original Prusa i3 MK3S & MK3S+ MMU2S_.ini.swp
View file

Binary file not shown.

4
printer/Original Prusa i3 MK3S & MK3S+ MMU2S_.ini
View file

@ -1,8 +1,4 @@
<<<<<<< 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 # 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_model =
bed_custom_texture = bed_custom_texture =
bed_shape = 0x0,250x0,250x210,0x210 bed_shape = 0x0,250x0,250x210,0x210