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.

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

resolve conflict #2453

Merged
merged 5 commits into from
Jan 21, 2023
Merged

resolve conflict #2453

merged 5 commits into from
Jan 21, 2023

Commits on Jan 21, 2023

  1. test: fix e2e tests

    rickstaa committed Jan 21, 2023
    1 Configuration menu
    Copy the full SHA
    d5d1f44 View commit details
    Browse the repository at this point in the history
  2. test: update snapshots

    rickstaa committed Jan 21, 2023
    1 Configuration menu
    Copy the full SHA
    cfa8423 View commit details
    Browse the repository at this point in the history
  3. test: fix e2e test data

    rickstaa committed Jan 21, 2023
    1 Configuration menu
    Copy the full SHA
    eab1402 View commit details
    Browse the repository at this point in the history
  4. test: update e2e test data

    rickstaa committed Jan 21, 2023
    1 Configuration menu
    Copy the full SHA
    fbb49e3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8667ea9 View commit details
    Browse the repository at this point in the history