mergify[bot]
commented
3 months ago Cherry-pick of 1b64094d5fb4e6929348cd7d2a02d1fa7ea31747 has failed:
On branch mergify/bp/2.9.x/pr-662
Your branch is up to date with 'origin/2.9.x'.
You are currently cherry-picking commit 1b64094d.
(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)
Changes to be committed:
modified: play-scala-streaming-example/app/controllers/HomeController.scala
modified: play-scala-streaming-example/app/controllers/ScalaEventSourceController.scala
modified: play-scala-streaming-example/app/views/index.scala.html
modified: play-scala-streaming-example/app/views/main.scala.html
modified: play-scala-streaming-example/app/views/scalacomet.scala.html
modified: play-scala-streaming-example/app/views/scalaeventsource.scala.html
modified: play-scala-streaming-example/build.sbt
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: play-scala-streaming-example/app/controllers/ScalaCometController.scala
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
The similar changes as https://github.com/playframework/play-samples/pull/483
This is an automatic backport of pull request #662 done by Mergify.