[Testbot] Plone 5.0 - Python 2.7 - Build # 1735 - Still failing! - 1 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1735 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/1735/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-02-23T13:32:27-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/bf77baaf144c35d54793fb8e41489adf57220249

fix bad merge

Files changed:
M CHANGES.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 27fa9ba..152f86a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,17 +8,15 @@ Changelog
 5.0a1 (unreleased)
 ------------------
 
-<<<<<<< HEAD
 - Make Plone tool read the exposeDCMetaTags from p.a.registry instead of
   of the site properties.
   [timo]
-=======
+
 - Hide plone.app.registry install profile in the add-ons control panel.
   [esteele]
 
 - Removed spamProtect.py script, since it doesn't offer real protection.
   [davisagli]
->>>>>>> 8674a5a8485ee7753ca49775b9f59d3af6f56342
 
 - Moved the member search form to plone.app.users
   [pabo3000]




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 898 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140223/bce5cb13/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 192712 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140223/bce5cb13/attachment-0003.obj>