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.

Sign up for GitHub

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

Jump to bottom

SPAL-15: Submodule improvements #506

Merged
merged 9 commits into from
Jun 25, 2023
Merged

SPAL-15: Submodule improvements #506

merged 9 commits into from
Jun 25, 2023

Conversation

sarahelsaig
Copy link
Member

@sarahelsaig sarahelsaig commented Jun 19, 2023 •
edited by jira bot
Loading

@github-actions
Copy link

This pull request has merge conflicts. Please resolve those before requesting a review.

@Psichorex
Copy link
Contributor

We have a conflict in Privacy

@sarahelsaig
Merge remote-tracking branch 'origin/dev' into issue/SPAL-15
ecf98fc 
# Conflicts:
#	src/Modules/Lombiq.Privacy
@sarahelsaig
Copy link
Member Author

We have a conflict in Privacy

Resolved. (there wasn't anything to do, just merged the branch from dev)

@Psichorex Psichorex merged commit 36989c9 into dev Jun 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Psichorex Psichorex Psichorex approved these changes

Assignees
No one assigned
Labels
requires-windows-build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sarahelsaig @Psichorex @LombiqBot