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

refactor: fix conflicts view when conflicted copies are already in trash #2339

Merged
merged 4 commits into from
Jun 27, 2023
Merged

refactor: fix conflicts view when conflicted copies are already in trash #2339

merged 4 commits into from
Jun 27, 2023

Commits on Jun 27, 2023

  1. refactor: fix conflicts view when conflicted copies are already in trash

    @amanharwara
    amanharwara committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    016ddda View commit details
    Browse the repository at this point in the history

  2. feat: add test

    @amanharwara
    amanharwara committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    cacf0fb View commit details
    Browse the repository at this point in the history

  3. feat: add test

    @amanharwara
    amanharwara committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    d7ddf03 View commit details
    Browse the repository at this point in the history

  4. feat: add test

    @amanharwara
    amanharwara committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    b488885 View commit details
    Browse the repository at this point in the history