Fix a bad merge

Author: javiereguiluz

src/Controller/Admin/BlogController.php

@@ -67,12 +67,8 @@ public function index(PostRepository $posts): Response
      * to constraint the HTTP methods each controller responds to (by default
      * it responds to all methods).
      */
-<<<<<<< HEAD
-    public function new(Request $request, EntityManagerInterface $entityManager): Response
-=======
     #[Route('/new', methods: ['GET', 'POST'], name: 'admin_post_new')]
-    public function new(Request $request): Response
->>>>>>> 44c4fc1 (PHP 8 Prototype)
+    public function new(Request $request, EntityManagerInterface $entityManager): Response
     {
         $post = new Post();
         $post->setAuthor($this->getUser());
@@ -128,13 +124,9 @@ public function show(Post $post): Response
     /**
      * Displays a form to edit an existing Post entity.
      */
-<<<<<<< HEAD
-    public function edit(Request $request, Post $post, EntityManagerInterface $entityManager): Response
-=======
     #[Route('/{id<\d+>}/edit', methods: ['GET', 'POST'], name: 'admin_post_edit')]
     #[IsGranted('edit', subject: 'post', message: 'Posts can only be edited by their authors.')]
-    public function edit(Request $request, Post $post): Response
->>>>>>> 44c4fc1 (PHP 8 Prototype)
+    public function edit(Request $request, Post $post, EntityManagerInterface $entityManager): Response
     {
         $form = $this->createForm(PostType::class, $post);
         $form->handleRequest($request);
@@ -155,13 +147,9 @@ public function edit(Request $request, Post $post): Response
     /**
      * Deletes a Post entity.
      */
-<<<<<<< HEAD
-    public function delete(Request $request, Post $post, EntityManagerInterface $entityManager): Response
-=======
     #[Route('/{id}/delete', methods: ['POST'], name: 'admin_post_delete')]
     #[IsGranted('delete', subject: 'post')]
-    public function delete(Request $request, Post $post): Response
->>>>>>> 44c4fc1 (PHP 8 Prototype)
+    public function delete(Request $request, Post $post, EntityManagerInterface $entityManager): Response
     {
         if (!$this->isCsrfTokenValid('delete', $request->request->get('token'))) {
             return $this->redirectToRoute('admin_post_index');