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 yunake/cwdapache https://bitbucket.org/yunake/cwdapache.git
git fetch yunake/cwdapache
git merge --no-ff -m 'Merged in yunake/cwdapache (pull request #21)' remotes/yunake/cwdapache/master
The fix is based on Issa's patch.