![]() Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved |
||
---|---|---|
.. | ||
delta | ||
Felix | ||
Hephestos | ||
K8200 | ||
makibox | ||
SCARA | ||
tvrrug/Round2 | ||
WITBOX |
![]() Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved |
||
---|---|---|
.. | ||
delta | ||
Felix | ||
Hephestos | ||
K8200 | ||
makibox | ||
SCARA | ||
tvrrug/Round2 | ||
WITBOX |