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

BOLT 1: Remove git conflict marker #628

Merged

Conversation

Projects
None yet
2 participants
@rustyrussell
Copy link
Collaborator

commented Jul 9, 2019

No description provided.

BOLT 1: Remove git conflict marker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
@t-bast

t-bast approved these changes Jul 9, 2019

@t-bast t-bast merged commit 76d4ab9 into lightningnetwork:master Jul 9, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.