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 duplicated file on pull request conflicted files #7211

Merged
merged 2 commits into from
Jun 15, 2019
Merged

Fix duplicated file on pull request conflicted files #7211

merged 2 commits into from
Jun 15, 2019

Commits on Jun 15, 2019

  1. fix duplicated file on pull request conflicted files

    @lunny
    lunny committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    dde3f2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into lunny/fix_duplicated_conflict_files

    @zeripath
    zeripath authored Jun 15, 2019
    Configuration menu
    Copy the full SHA
    304e473 View commit details
    Browse the repository at this point in the history