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 mnave/antismash https://bitbucket.org/mnave/antismash.git
git fetch mnave/antismash
git merge --no-ff -m 'Merged in mnave/antismash/move_to_jinja (pull request #116)' remotes/mnave/antismash/move_to_jinja
--transatpks_da will need some rewrite to get to a useful state. Thus, all the code regarding this part will probably need some changes.