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/jenkinsj/cmsplugin-news
hg merge 7d48ad9b8de3
hg commit -m 'Merged in jenkinsj/cmsplugin-news (pull request #1)'
These are some quick changes to make this plugin compatible with Django 1.5.