Update fr/core-libraries/behaviors/tree.rst #483

Merged
merged 1 commit into from Feb 5, 2013

Projects

None yet

2 participants

@dbyzero
dbyzero commented Feb 5, 2013

Remove conflict tags from doc.

@lorenzo lorenzo merged commit 6ddd353 into cakephp:master Feb 5, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment