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

Update conflicts.yml #3009

Merged
merged 2 commits into from
Dec 30, 2022
Merged

Update conflicts.yml #3009

merged 2 commits into from
Dec 30, 2022

Commits on Dec 29, 2022

  1. Update conflicts.yml

    @efb4f5ff-1298-471a-8973-3d47447115dc
    efb4f5ff-1298-471a-8973-3d47447115dc authored Dec 29, 2022
    Configuration menu
    Copy the full SHA
    ee1b832 View commit details
    Browse the repository at this point in the history

  2. Delete dummy-conflicts.yml

    @efb4f5ff-1298-471a-8973-3d47447115dc
    efb4f5ff-1298-471a-8973-3d47447115dc authored Dec 29, 2022
    Configuration menu
    Copy the full SHA
    e03b428 View commit details
    Browse the repository at this point in the history