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 HTLC changes from hardfork to testnet #1538

Merged
merged 2 commits into from
Jan 25, 2019
Merged

Conversation

jmjatlanta
Copy link
Contributor

A minor change (uint8_t changed to char) in HTLC makes the output clearer and easier to use. This will merge that change into the testnet branch.

@abitmore
Copy link
Member

Need to merge to testnet_release then merge to testnet, unless we want to abandon testnet_release branch.

@jmjatlanta
Copy link
Contributor Author

Need to merge to testnet_release then merge to testnet, unless we want to abandon testnet_release branch.

That didn't sound right, so I reviewed the Git Flow doc. Yep, you're right. I will attempt a rebase.

@jmjatlanta jmjatlanta changed the base branch from testnet to testnet_release January 24, 2019 21:17
Copy link
Member

@oxarbitrage oxarbitrage left a comment

Choose a reason for hiding this comment

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

looks good.

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.

3 participants