Skip to content

Update of Committee Logo colors - SM#4/SM#5 2025 - 2025-09-30/2025-11-10 - #47

Merged
Astrea0014 merged 12 commits into
mainfrom
ripSquid-laserviolet_logos
Jun 20, 2026
Merged

Astrea0014 merged 12 commits into
mainfrom
ripSquid-laserviolet_logos

Conversation

@Astrea0014

@Astrea0014 Astrea0014 commented Jun 13, 2026 •

Copy link
Copy Markdown
Contributor

Due to merge conflicts needing manual attention (PR #39) a new branch on the main repo was made to resolve the merge conflicts, and therefore needs to be merged instead of the fork. See #39 for details about this PR.

Documents

Proposition: https://drive.google.com/file/d/1Yh_HjmvcS21hyAAaGSZg3bX7vRdiZaFB/view

Signed Protocol (1st vote): https://drive.google.com/file/d/1A4ODhpNkKEeit0jRBCf0d2F5PgTRVM6s/view
Signed Protocol (2nd vote): https://drive.google.com/file/d/1FDFPUOwuJxyMCVG_YvSfof89RCDJ-LGK/view

@Astrea0014
Astrea0014 requested a review from Cactooz June 13, 2026 02:34

@Cactooz Cactooz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, idk really why this was made as a new PR though.
The PR is still missing the link to the proposition and more importantly the signed protocols.

Comment thread pm/eng/pm_for_grafisk_profil.md Outdated
Comment thread pm/swe/pm_for_grafisk_profil.md Outdated
Comment thread pm/eng/pm_for_insignia.md Outdated
Comment thread pm/eng/pm_for_grafisk_profil.md Outdated
Comment thread pm/swe/pm_for_grafisk_profil.md Outdated
Comment thread pm/swe/pm_for_insignia.md Outdated
@Cactooz Cactooz added the memos Updates, Additions and Revision of Memos label Jun 13, 2026
@Astrea0014

Copy link
Copy Markdown
Contributor Author

It is a new PR because I do not know of a way to have the old PR merge the branch instead of the fork, and I did not find a way to resolve the merge conflicts manually without pulling the changes from the fork into a new branch and editing them there.

I will add the links to the relevant documents.

Astrea0014 and others added 6 commits June 13, 2026 14:14
Update the revision date

Co-authored-by: Hugo <54435874+Cactooz@users.noreply.github.com>
Co-authored-by: Hugo <54435874+Cactooz@users.noreply.github.com>
Co-authored-by: Hugo <54435874+Cactooz@users.noreply.github.com>
Co-authored-by: Hugo <54435874+Cactooz@users.noreply.github.com>
@Astrea0014
Astrea0014 requested a review from Cactooz June 13, 2026 13:58
@Cactooz Cactooz changed the title [Manual merge PR] Update of Committee Logo colors - SM#4/SM#5 2025 - 2025-09-30/2025-11-10 Update of Committee Logo colors - SM#4/SM#5 2025 - 2025-09-30/2025-11-10 Jun 15, 2026
@Astrea0014
Astrea0014 merged commit 9952f7e into main Jun 20, 2026
2 of 4 checks passed
@Astrea0014
Astrea0014 deleted the ripSquid-laserviolet_logos branch June 20, 2026 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

memos Updates, Additions and Revision of Memos

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants