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 default
hg pull -r default https://bitbucket.org/TracyWebTech/feedzilla
hg merge b1467740eeef
hg commit -m 'Merged in TracyWebTech/feedzilla (pull request #7)'
Feedzilla was giving me an error exception without traceback. By changing logging.error to log.exception the traceback is also logged and way more "debugable".
Finally the error was an invalid feed XML that IMHO should be treated as a warning and not as a error message, so I've added an special treatment for that.