Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
Make copyright header lines uniform #8675
1 similar comment
rebased and conflicts resolved in four files
src/policy/policy.cpp - The conflict was with date being bumped to '2016' by a prior commit on the same line as this pull's edit.
src/policy/policy.h - same as with policy.cpp
src/test/bctest.py - The conflict was with a new 'The Bitcoin Core developers' copyright holder was added in the adjacent line to my edit where the comma was removed after 'BitPay'.
src/test/bitcoin-util-test.py - same as with bctest.py