Skip to content

Match main#15

Merged
CTH-npitx merged 24 commits intomainfrom
match-main
Jul 24, 2025
Merged

Match main#15
CTH-npitx merged 24 commits intomainfrom
match-main

Conversation

@CTH-npitx
Copy link
Copy Markdown
Collaborator

this matches the mains

CTH-npitx added 24 commits June 25, 2025 11:46
Create the spring term presentation
This matches main to be equal to the forks main, so it only needs to get the commits from the base repository
This region is an unathurized merge
this undoes the placeholder change
This undoes all the changes done as a placeholder
This is made to copy the unauthorized merge via PR, allow one to see what it was
transfer in the copy of the merge
This transfers in the rest of the unathorized changes
This returns the original, pre-placeholder, files
the first part of Revert Unathorized Changes
These are the first group of unauthorized edits
Revert Unathorized
This (should) revert all the unathorized edits. It was done in the same fork that caused said issues
This matches the main's of both branches
this wasn't supposed to happen. oops
@CTH-npitx CTH-npitx merged commit a2a93ca into main Jul 24, 2025
@CTH-npitx CTH-npitx deleted the match-main branch July 24, 2025 17:07
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