Conflicts: Marlin/example_configurations/delta/generic/Configuration.h Marlin/example_configurations/delta/kossel_mini/Configuration.h Marlin/language.h Conflicts solved |
||
|---|---|---|
| .. | ||
| Logo | ||
| BedLeveling.md | ||
| changelog.md | ||
| Compilation.md | ||
| Contributing.md | ||
| COPYING.md | ||
| Features.md | ||
| FilamentSensor.md | ||
| GCodes.md | ||
| LCD Menu Tree.pdf | ||
| LCDLanguageFont.md | ||
| Menu Plans.xlsx | ||
| RampsServoPower.md | ||