Add hybrid #1075
Add hybrid #1075
Conversation
added hybrid car to label-options file and to en i18n
|
I will start a translate PR for this after everything settles with the re-work of the label translations is wrapped up |
Abby-Wheelis
changed the base branch from
service_rewrite_2023
to
add_labeling_screen
Abby-Wheelis
changed the base branch from
add_labeling_screen
to
service_rewrite_2023
Abby-Wheelis
changed the base branch from
service_rewrite_2023
to
onboarding_routing_sept_2023
Abby-Wheelis
changed the base branch from
onboarding_routing_sept_2023
to
service_rewrite_2023
|
This was based on the feature branch ( |
There was a problem hiding this comment.
@Abby-Wheelis I am fine with the two actual commits in the PR.
However, it looks like there are several other file changes here as well, and they are staying even after we have merged from main to service_rewrite_2023
e.g.
e-mission-phone/www/js/App.tsx
Line 94 in 7338c18
App.tsx here.
If you can't figure out how this happened, you may want to just close this PR and create a new one to make sure that it is clean.
|
I was able to resolve the diffs to just be the relevant changes by merging upstream and toggling the target branch |
This PR will accomplish the changes proposed in issue #1013