Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

marlin-anet-a8
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ddd9d903

Commit ddd9d903 authored 5 years ago by Scott Lahteine

Downloads
- Patches
- Plain Diff

Fix option / string name conflict

parent c3f09e2b

Branches

Tags

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_en.h 1 addition, 1 deletion

.../src/lcd/extensible_ui/lib/lulzbot/language/language_en.h
Marlin/src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h 1 addition, 1 deletion

.../src/lcd/extensible_ui/lib/lulzbot/language/language_fr.h
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp 2 additions, 2 deletions

...ensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_advanced_settings.cpp 1 addition, 1 deletion

...tensible_ui/lib/lulzbot/screens/bio_advanced_settings.cpp
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp 1 addition, 1 deletion

...ible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp

with 6 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment