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:
hg update 7a3b5fa3f4c6hg pull -r update-to-60D.112 https://bitbucket.org/daniel_fort/magic-lantern# Note: This will create a new head!hg merge update-to-60D.112hg commit -m 'Merged in daniel_fort/magic-lantern/update-to-60D.112 (pull request #917)'