cakephp/docs — pull request #483 by dbyzero (2013-02-05 08:44:54+00:00)
Title: Update fr/core-libraries/behaviors/tree.rst

Remove conflict tags from doc.