Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Apr 19, 2019

Yet another silent merge conflict. This one was caused by unsorted includes.

@maflcko maflcko merged commit fadf7d1 into bitcoin:master Apr 19, 2019
maflcko pushed a commit that referenced this pull request Apr 19, 2019
fadf7d1 wallet: Remove unused import checkpoints.h (MarcoFalke)

Pull request description:

  Yet another silent merge conflict. This one was caused by unsorted includes.

ACKs for commit fadf7d:

Tree-SHA512: b5bcbddfa0c443bd179cd239cb1d9942d904303d59ca72f97bcac8711f8d9cbdf96821c7fd33ed6c0f4ec9ec1ad72af176ffae11c5f19db861a0486022e321a5
@maflcko maflcko deleted the 1904-walletRemCheck branch April 19, 2019 14:26
@jnewbery
Copy link
Contributor

Tested ACK fadf7d1

pravblockc pushed a commit to pravblockc/dash that referenced this pull request Sep 25, 2021
fadf7d1 wallet: Remove unused import checkpoints.h (MarcoFalke)

Pull request description:

  Yet another silent merge conflict. This one was caused by unsorted includes.

ACKs for commit fadf7d:

Tree-SHA512: b5bcbddfa0c443bd179cd239cb1d9942d904303d59ca72f97bcac8711f8d9cbdf96821c7fd33ed6c0f4ec9ec1ad72af176ffae11c5f19db861a0486022e321a5
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Sep 30, 2021
kwvg pushed a commit to kwvg/dash that referenced this pull request Oct 12, 2021
fadf7d1 wallet: Remove unused import checkpoints.h (MarcoFalke)

Pull request description:

  Yet another silent merge conflict. This one was caused by unsorted includes.

ACKs for commit fadf7d:

Tree-SHA512: b5bcbddfa0c443bd179cd239cb1d9942d904303d59ca72f97bcac8711f8d9cbdf96821c7fd33ed6c0f4ec9ec1ad72af176ffae11c5f19db861a0486022e321a5
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants