Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[24.1] Fix bad merge conflict resolution #19297

Merged
merged 1 commit into from
Dec 10, 2024
Merged

[24.1] Fix bad merge conflict resolution #19297

merged 1 commit into from
Dec 10, 2024

Conversation

nsoranzo
Copy link
Member

Replace #19296 but opened from my fork this time, and fixing @mvdbeek's review comment.

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@nsoranzo nsoranzo mentioned this pull request Dec 10, 2024
Closed
4 tasks
@mvdbeek mvdbeek merged commit 45f315d into galaxyproject:release_24.1 Dec 10, 2024
39 of 44 checks passed
@github-actions github-actions bot added the area/database Galaxy's database or data access layer label Dec 10, 2024
@github-actions github-actions bot added this to the 24.1 milestone Dec 10, 2024
@nsoranzo nsoranzo deleted the release_24.1_fix_merge branch December 10, 2024 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mvdbeek mvdbeek mvdbeek approved these changes

Assignees
No one assigned
Labels
area/database Galaxy's database or data access layer kind/bug
Projects
None yet
Milestone
24.1
Development

Successfully merging this pull request may close these issues.
2 participants
@nsoranzo @mvdbeek