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

解决冲突 #71

Merged
merged 3 commits into from
Nov 29, 2023
Merged

解决冲突 #71

merged 3 commits into from
Nov 29, 2023

Commits on Nov 29, 2023

  1. add AutoUpdater

    @cofbro
    cofbro committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c6d334c View commit details
    Browse the repository at this point in the history

  2. resolve conflicts

    @cofbro
    cofbro committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    f417809 View commit details
    Browse the repository at this point in the history

  3. fix conflicts

    @cofbro
    cofbro committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4cde077 View commit details
    Browse the repository at this point in the history