Skip to content

Commit ec740ff

Browse files
committed
Remove stray merge marker
1 parent 569f18a commit ec740ff

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

docs/en/appendices/migration-guides.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ bin/cake upgrade rector --rules cakephp52 <path/to/app/src>
3131
Run rector before updating your `composer.json` dependencies
3232
to ensure the tool can resolve class names correctly.
3333

34-
<<<<<<< HEAD
3534
- [5.0 Upgrade Guide](5-0-upgrade-guide)
3635
- [5.0 Migration Guide](5-0-migration-guide)
3736
- [5.1 Migration Guide](5-1-migration-guide)

0 commit comments

Comments
 (0)