Fix F9 Web-page conflict. #1061
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twpol
pushed a commit
that referenced
this pull request
Mar 17, 2025
- Pull request #900 at b54024b: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #961 at ffccb2e: Improvements for Power Supplies - Pull request #1015 at 1ade99e: Enhancements for EP brakes - Pull request #1029 at 31fd7d2: Superelevation Follow Up Fixes - Pull request #1031 at c097fd2: Multiplayer Server, forked from Open Rails Ultimate; blueprint https://blueprints.launchpad.net/or/+spec/multiplayer-server - Pull request #1047 at eb8027b: Docs: adds translation docs - Pull request #1059 at 313f795: Fix F9 powersupply crashes - Pull request #1061 at f75dc71: Fix F9 Web-page conflict. - Pull request #1055 at 1a01818: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
twpol
pushed a commit
that referenced
this pull request
Mar 17, 2025
- Pull request #900 at b54024b: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #961 at ffccb2e: Improvements for Power Supplies - Pull request #1015 at 1ade99e: Enhancements for EP brakes - Pull request #1029 at 31fd7d2: Superelevation Follow Up Fixes - Pull request #1047 at eb8027b: Docs: adds translation docs - Pull request #1059 at 313f795: Fix F9 powersupply crashes - Pull request #1061 at f75dc71: Fix F9 Web-page conflict. - Pull request #1055 at 1a01818: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An internal conflict was detected that caused an internal loop when the TrainCarOperations web page version was opened and F9 was not visible.
More info here:
Bug #2103422