[Testbot] [FAIL] plone.app.contenttypes by mauritsvanrees <maurits at vanrees.org>

[Jenkins Job FAIL]

Repository: plone.app.contenttypes
Branch: master
Author: mauritsvanrees <maurits at vanrees.org>

Jenkins Information
-------------------

[SUCCESS] kgs-plone.app.contenttypes-plone-5.0-python-2.7 kgs
[FAILURE] kgs-plone.app.contenttypes-plone-4.3-python-2.6 kgs
[FAILURE] kgs-plone.app.contenttypes-plone-4.3-python-2.7 kgs



Github Information
------------------

Maurits van Rees
Remove merge conflict left-over.
https://github.com/plone/plone.app.contenttypes/commit/04d7750ea06b3f942a1a7b1dc0070c06ddb53a9a