Need help cloning? Visit
is a free Git and Mercurial client for Windows.
is a free Git and Mercurial client for Mac.
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/frnknglrt/djangotoolbox
hg merge 49825a72cf33
hg commit -m 'Merged in frnknglrt/djangotoolbox (pull request #2)'
as we discussed i've pulled the changes from the django-googleappengine to the django-toolbox. Now django-cachemachine should work with all nonrel backends. I've tested it with the gae backend.