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

1. 
   MarcoFalke commented at 8:31 AM on July 14, 2016: member

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

2. [qa] Solve merge conflict of 4324bd237c3147fc153ba5046c211f03e8ac956a 66668c420a
3. MarcoFalke added the label Tests on Jul 14, 2016
4. MarcoFalke renamed this:
   [qa] Solve merge conflict of 4324bd237c3147fc153ba5046c211f03e8ac956a
   [qa] Solve trivial merge conflict in p2p-segwit.py
   on Jul 14, 2016
5. 
   jonasschnelli commented at 8:45 AM on July 14, 2016: contributor

   ACK

6. 
   paveljanik commented at 8:49 AM on July 14, 2016: contributor

   ACK https://github.com/bitcoin/bitcoin/pull/8340/commits/66668c420a23936cb228737f982ee58c08211071

7. MarcoFalke added this to the milestone 0.13.0 on Jul 14, 2016
8. MarcoFalke merged this on Jul 14, 2016
9. MarcoFalke closed this on Jul 14, 2016

   ---

10. MarcoFalke referenced this in commit af9b7a9f2f on Jul 14, 2016
11. MarcoFalke deleted the branch on Jul 14, 2016
12. DrahtBot locked this on Sep 8, 2021

Contributors

MarcoFalkejonasschnellipaveljanik

Milestone
0.13.0