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 merge conflict markers #4853

Merged
merged 5 commits into from
Nov 7, 2023
Merged

fixes merge conflict markers #4853

merged 5 commits into from
Nov 7, 2023

Commits on Nov 6, 2023

  1. fixes merge conflict markers

    @harryob
    harryob committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    de6875e View commit details
    Browse the repository at this point in the history

  2. forgot to tick it

    @harryob
    harryob committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    bf3eb9c View commit details
    Browse the repository at this point in the history

  3. moves some stuff around

    @harryob
    harryob committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    70d95bf View commit details
    Browse the repository at this point in the history

  4. my brain

    @harryob
    harryob committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    ccc780e View commit details
    Browse the repository at this point in the history

  5. Update code/modules/mapping/merge_conflicts.dm 

    Co-authored-by: Drathek <[email protected]>
    @harryob @Drulikar
    harryob and Drulikar committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    cb2e9d0 View commit details
    Browse the repository at this point in the history