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

Pull main 2 #22

Draft
wants to merge 5 commits into
base: test-branch-jobs
Choose a base branch
from
Draft

Pull main 2 #22

wants to merge 5 commits into from

Commits on Jul 6, 2023

  1. Test

    @jacobtylerwalls
    jacobtylerwalls committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    f42e1ad View commit details
    Browse the repository at this point in the history

  2. Conflict

    @jacobtylerwalls
    jacobtylerwalls committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    d88d6ab View commit details
    Browse the repository at this point in the history

  3. Actual conflict

    @jacobtylerwalls
    jacobtylerwalls committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    e0347d2 View commit details
    Browse the repository at this point in the history

  4. empty

    @jacobtylerwalls
    jacobtylerwalls committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    b90f984 View commit details
    Browse the repository at this point in the history

  5. Substantive

    @jacobtylerwalls
    jacobtylerwalls committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    e0ebfe0 View commit details
    Browse the repository at this point in the history