Fixing conflicts part 3:

Browse source

Some files have whitespace changes that make resolving conflicts difficult.
Take the version from master first, next commit will apply changes from master_250

...

This commit is contained in:

Lukas Matena 2022-06-29 15:32:15 +02:00

parent e6d341f9f2

commit d662bf2a18

10 changed files with 201 additions and 24595 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

src/libslic3r/GCode

GCodeProcessor.cpp

3444

src/libslic3r/GCode/GCodeProcessor.cpp

View file

File diff suppressed because it is too large Load diff