Skip to content
This repository was archived by the owner on Oct 5, 2025. It is now read-only.

remove merge conflict#2

Merged
TheZoidMaster merged 31 commits intoNexulien:mainfrom
defautluser0:main
Jul 25, 2025
Merged

remove merge conflict#2
TheZoidMaster merged 31 commits intoNexulien:mainfrom
defautluser0:main

Conversation

@defautluser0
Copy link

No description provided.

Vendicated and others added 30 commits June 8, 2025 20:56
This bug is fixed in electron 37, so the workaround is no longer needed
@defautluser0
Copy link
Author

this pr kinda got forgotten

@TheZoidMaster
Copy link
Member

mb i kinda forgot about nexop entirely 😭

@TheZoidMaster TheZoidMaster merged commit c03c98e into Nexulien:main Jul 25, 2025
1 check passed
@defautluser0
Copy link
Author

you forgor💀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants