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

[qa] Solve trivial merge conflict in p2p-segwit.py #8340

Merged
merged 1 commit into from Jul 14, 2016

Conversation

Projects
None yet
3 participants
@MarcoFalke
Member

MarcoFalke commented Jul 14, 2016

Solve trivial merge conflict of ca40ef6 = Merge(4324bd2, 46c9620)

@MarcoFalke MarcoFalke added the Tests label Jul 14, 2016

@MarcoFalke MarcoFalke changed the title from [qa] Solve merge conflict of 4324bd237c3147fc153ba5046c211f03e8ac956a to [qa] Solve trivial merge conflict in p2p-segwit.py Jul 14, 2016

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli
Member

jonasschnelli commented Jul 14, 2016

ACK

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Jul 14, 2016

Contributor

ACK 66668c4

Contributor

paveljanik commented Jul 14, 2016

ACK 66668c4

@MarcoFalke MarcoFalke added this to the 0.13.0 milestone Jul 14, 2016

@MarcoFalke MarcoFalke merged commit 66668c4 into bitcoin:master Jul 14, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

MarcoFalke added a commit that referenced this pull request Jul 14, 2016

Merge #8340: [qa] Solve trivial merge conflict in p2p-segwit.py
66668c4 [qa] Solve merge conflict of 4324bd2 (MarcoFalke)

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1607-qaSolveMerge branch Jul 14, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment