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

Resolve merge conflicts in test yml files - v2.17 merge #1509

Merged
merged 6 commits into from
Oct 23, 2024
Merged

Resolve merge conflicts in test yml files - v2.17 merge #1509

merged 6 commits into from
Oct 23, 2024

Commits on Oct 22, 2024

  1. Resolve conflicts

    @b-gopalswami
    b-gopalswami committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    35b0f00 View commit details
    Browse the repository at this point in the history

  2. resolve more conflicts

    @b-gopalswami
    b-gopalswami committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    7713254 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. resolve more conflicts

    @b-gopalswami
    b-gopalswami committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    91c1335 View commit details
    Browse the repository at this point in the history

  2. Fix lint

    @b-gopalswami
    b-gopalswami committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    9ac8545 View commit details
    Browse the repository at this point in the history

  3. Merge base branch

    @b-gopalswami
    b-gopalswami committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d70abc2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'mk/merge-v2.17' into fix-yml-merge

    @mateusz-sekara
    mateusz-sekara authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    f487e7c View commit details
    Browse the repository at this point in the history