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

Fixes a boggus conflict resolution #6469

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Fixes a boggus conflict resolution #6469

merged 1 commit into from
Oct 2, 2018

Commits on Oct 2, 2018

  1. Fixes a boggus conflict resolution

    Maël Nison committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    7ac42cd View commit details
    Browse the repository at this point in the history