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

Merge develop into feature/box-storage #372

Merged
merged 2 commits into from
Aug 24, 2022

Conversation

algochoi
Copy link
Contributor

@algochoi algochoi commented Aug 22, 2022

This PR resolves the following merge conflicts between develop and feature/box-storage:

CONFLICT (content): Merge conflict in CHANGELOG.md
CONFLICT (content): Merge conflict in Makefile
CONFLICT (modify/delete): run_integration.sh deleted in develop and modified in HEAD.  Version HEAD of run_integration.sh left in tree.

This merge also requires two changes:

@algochoi algochoi changed the base branch from feature/box-storage to develop August 22, 2022 18:52
@algochoi algochoi changed the base branch from develop to feature/box-storage August 22, 2022 18:57
@algochoi algochoi marked this pull request as ready for review August 24, 2022 12:18
@algochoi algochoi merged commit 783514f into feature/box-storage Aug 24, 2022
@algochoi algochoi deleted the merge-develop-to-boxes branch August 24, 2022 12:18
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