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

fix: conflict picker #1123

Merged
merged 4 commits into from
Mar 22, 2024
Merged

fix: conflict picker #1123

merged 4 commits into from
Mar 22, 2024

Commits on Mar 22, 2024

  1. fix: conflict picker 

    Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
    @skjnldsv
    skjnldsv committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    365adde View commit details
    Browse the repository at this point in the history

  2. fix: axios and OC.appConfig usage 

    Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
    @skjnldsv
    skjnldsv committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    0152903 View commit details
    Browse the repository at this point in the history

  3. fix(cypress): conflict resolution checks and cypress state 

    Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
    @skjnldsv
    skjnldsv committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    d143e41 View commit details
    Browse the repository at this point in the history

  4. chore(dev-deps): update 

    Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
    @skjnldsv
    skjnldsv committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    426015e View commit details
    Browse the repository at this point in the history