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 36acb0f9c3e2hg pull -r update_to_7D.206 https://bitbucket.org/daniel_fort/magic-lantern# Note: This will create a new head!hg merge update_to_7D.206hg commit -m 'Merged in daniel_fort/magic-lantern/update_to_7D.206 (pull request #878)'