Skip to content
This repository was archived by the owner on Feb 28, 2024. It is now read-only.

Propper unified formatting #59

Merged
merged 4 commits into from
Aug 17, 2022
Merged

Propper unified formatting #59

merged 4 commits into from
Aug 17, 2022

Conversation

@l-2-j
Copy link
Member

@l-2-j l-2-j commented Aug 17, 2022 •
edited
Loading

Fixes CI hopefully.

I recommend reviewing with whitespace hidden.
image

@l-2-j l-2-j requested a review from zkxs August 17, 2022 15:14
@l-2-j l-2-j marked this pull request as draft August 17, 2022 15:16
@l-2-j l-2-j marked this pull request as ready for review August 17, 2022 18:14
@l-2-j
Copy link
Member Author

l-2-j commented Aug 17, 2022 •
edited
Loading

I'm sure the CI will just magically fix itself if we merge this , right @zkxs ? x'D I think that's how to read the one passing & one failing CI thing at least...

@EIA485
Copy link
Member

EIA485 commented Aug 17, 2022

Time to test in prod I guess ¯_(ツ)_/¯

@l-2-j l-2-j requested a review from EIA485 August 17, 2022 18:19
@l-2-j l-2-j merged commit 4e0c9c5 into master Aug 17, 2022
@zkxs
Copy link
Collaborator

zkxs commented Aug 17, 2022

Hello merge conflicts my old friend~

@EIA485
Copy link
Member

EIA485 commented Aug 19, 2022

this seems to have messed up all of the indention. everything is only intended 2 spaces instead of 4

@zkxs
Copy link
Collaborator

zkxs commented Aug 19, 2022

Surely that was intentional? I doubt LJ overlooked a +2000 -2000 line diff.

@EIA485 EIA485 mentioned this pull request Aug 19, 2022
Merged
@EIA485
Copy link
Member

EIA485 commented Aug 19, 2022

our CONTRIBUTING.md states cs files should have a 4 space indentation

@zkxs
Copy link
Collaborator

zkxs commented Aug 19, 2022

our CONTRIBUTING.md states cs files should have a 4 space indentation

Well, seems like the move is to update CONTRIBUTING.md, then. #62 does that.

@l-2-j
Copy link
Member Author

l-2-j commented Aug 20, 2022

Apologies, I should've done more checking that the update matches the current styles instead of just quickly trying to fix the CI.

@l-2-j l-2-j deleted the chore/lint-fix branch August 20, 2022 12:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@EIA485 EIA485 Awaiting requested review from EIA485

1 more reviewer

@zkxs zkxs zkxs approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@l-2-j @EIA485 @zkxs