Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git remote add james_hilliard/ckpool https://bitbucket.org/james_hilliard/ckpool.git
git fetch james_hilliard/ckpool
git merge --no-ff -m 'Merged in james_hilliard/ckpool/testnet-diff-fix (pull request #14)' remotes/james_hilliard/ckpool/testnet-diff-fix
Not entirely sure this is correct but this appeared to fix diff for some lower testnet difficulties like diff1.