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 Define Spacing #179

Merged
merged 17 commits into from
Sep 6, 2021
Merged

Update Define Spacing #179

merged 17 commits into from
Sep 6, 2021

Conversation

ZephyrTFA
Copy link
Member

UPDATES A LOT OF SPACING FOR DEFINES TO BE IN LINE WITH CODING GUIDELINES.
THIS WAS DONE VIA REGEX AND WILL REQUIRE AT LEAST A WEEK OF BEING TM'D BEFORE FULL MERGING

@github-actions github-actions bot added the Admin They do it for free. label Aug 21, 2021
@MarkSuckerberg MarkSuckerberg added the Test Merge Candidate You do it for free. label Aug 22, 2021
martinlyra
martinlyra suggested changes Aug 23, 2021
View reviewed changes
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Aug 29, 2021
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 29, 2021
martinlyra
martinlyra suggested changes Aug 29, 2021
View reviewed changes
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 1, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2021

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

@martinlyra
Copy link
Contributor

Just discard your changes on the check_regex.py, reflect your new target(s) to the check_regex.yaml file. That should be good to go!

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 1, 2021
@martinlyra martinlyra mentioned this pull request Sep 1, 2021
Merged
@shiptest-server
Copy link
Member

Test Merge Deployed

Server Instance

shiptest

Revision

Origin: bf2a3d7
Pull Request: 289cc24
Server: ca0ff8b9f76846976a9d8d2ec5e18cf60ecd28be

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 4, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2021

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

@AsciiSquid AsciiSquid mentioned this pull request Sep 4, 2021
Closed
@shiptest-server
Copy link
Member

Test Merge Removed

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 5, 2021
@MarkSuckerberg
Copy link
Member

LGTM

@MarkSuckerberg MarkSuckerberg merged commit 888b104 into shiptest-ss13:master Sep 6, 2021
@martinlyra
Copy link
Contributor

🎉

@Pontenerd Pontenerd mentioned this pull request Sep 19, 2021
Closed
@ZephyrTFA ZephyrTFA deleted the spacingupdate branch December 29, 2021 20:20
@ZephyrTFA ZephyrTFA removed the Test Merge Candidate You do it for free. label Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinlyra martinlyra martinlyra requested changes

Assignees
No one assigned
Labels
Admin They do it for free.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ZephyrTFA @martinlyra @shiptest-server @MarkSuckerberg