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 221152120589hg pull -r update-to-700D.115 https://bitbucket.org/daniel_fort/magic-lantern# Note: This will create a new head!hg merge update-to-700D.115hg commit -m 'Merged in daniel_fort/magic-lantern/update-to-700D.115 (pull request #813)'
Yes, it is very easy to upgrade and downgrade the Canon firmware. I have both the 1.1.4 and 1.1.5 Canon firmware update on a spare card. To make it really easy for testers I uploaded the firmware to my bitbucket download area.