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.

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

update submodules #147

Merged
merged 1 commit into from
Oct 31, 2023
Merged

update submodules #147

merged 1 commit into from
Oct 31, 2023

Conversation

Vixea
Copy link
Contributor

@Vixea Vixea commented Oct 27, 2023

@Vixea
Copy link
Contributor Author

Vixea commented Oct 27, 2023

Could someone explain why there are merge conflicts where there are none local?
nevermind

@Vixea Vixea force-pushed the update-submodules branch 3 times, most recently from 18acefd to 7f69bf0 Compare October 28, 2023 01:51
@Vixea Vixea force-pushed the update-submodules branch from 7f69bf0 to a8bfc98 Compare October 31, 2023 10:29
@Drakulix
Copy link
Member

Thanks!

@Drakulix Drakulix merged commit 543abf1 into pop-os:master Oct 31, 2023
1 check passed
@Vixea Vixea deleted the update-submodules branch October 31, 2023 19:49
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.

2 participants