search

enhavo / enhavo

Modern CMS with shop features based on fullstack symfony and sylius components
https://www.enhavo.com/
MIT License
86 stars 30 forks source link

fix: routing manager update (backport #2033) #2070

Open mergify[bot] opened 2 months ago

mergify[bot] commented 2 months ago
Q A
Bug fix? yes
New feature? no
BC-Break? no
Backport 0.14
License MIT

fix: routing manager update

This is an automatic backport of pull request #2033 done by Mergify.

mergify[bot] commented 2 months ago

Cherry-pick of 15f6171638e42a196d571f8e0e45787db078bb73 has failed:

On branch mergify/bp/0.13/pr-2033
Your branch is up to date with 'origin/0.13'.

You are currently cherry-picking commit 15f617163.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   src/Enhavo/Bundle/RoutingBundle/Manager/RouteManager.php

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally