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

Try to fix merge conflict #474

Merged
merged 2 commits into from
Feb 16, 2022
Merged

Try to fix merge conflict #474

merged 2 commits into from
Feb 16, 2022

Commits on Feb 16, 2022

  1. Try to fix merge conflict

    @cansavvy
    cansavvy committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    e4e5700 View commit details
    Browse the repository at this point in the history

  2. fix merge

    @cansavvy
    cansavvy committed Feb 16, 2022
    Configuration menu
    Copy the full SHA
    5c704bc View commit details
    Browse the repository at this point in the history