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.

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

Platoon Renaming #55

Merged
merged 9 commits into from
Nov 7, 2023
Merged

Platoon Renaming #55

merged 9 commits into from
Nov 7, 2023

Conversation

morrowwolf
Copy link
Member

This is quite possibly the most cursed and forced thing I have ever added to CM.

I'm sure it'll be a buggy mess but let's see what we run into.

Copy link

github-actions bot commented Nov 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Copy link

github-actions bot commented Nov 6, 2023

Conflicts have been resolved. A maintainer will review the pull request shortly.

@morrowwolf morrowwolf changed the title Squad Renaming Platoon Renaming Nov 7, 2023
@morrowwolf morrowwolf enabled auto-merge (squash) November 7, 2023 19:41
@morrowwolf morrowwolf merged commit 4996bf9 into master Nov 7, 2023
28 checks passed
@morrowwolf morrowwolf deleted the squad-renaming branch November 7, 2023 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant