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

Box storage merge develop #668

Merged
merged 8 commits into from
Oct 12, 2022
Merged

Conversation

jasonpaulos
Copy link
Contributor

Merge develop into feature/box-storage.

$ git merge develop
Auto-merging .test-env
Auto-merging src/client/v2/algod/algod.ts
CONFLICT (content): Merge conflict in src/client/v2/algod/algod.ts
Auto-merging tests/cucumber/steps/steps.js
Auto-merging tests/cucumber/unit.tags
Automatic merge failed; fix conflicts and then commit the result.

This was a pretty straightforward merge, as the only conflict requiring attention was the imports from src/client/v2/algod/algod.ts

Copy link
Contributor

@algochoi algochoi left a comment

Choose a reason for hiding this comment

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

LGTM

@jasonpaulos jasonpaulos merged commit 075d8d0 into feature/box-storage Oct 12, 2022
@jasonpaulos jasonpaulos deleted the box-storage-merge-devlop branch October 12, 2022 17:56
@jasonpaulos jasonpaulos restored the box-storage-merge-devlop branch October 12, 2022 17:56
@jasonpaulos jasonpaulos deleted the box-storage-merge-devlop branch October 12, 2022 17:56
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.

6 participants