From fc414cde81f9bf9ca7cc352f89fe6f422d46cb93 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Thu, 9 Jan 2025 11:32:50 +0100 Subject: [PATCH] Fix recipes update conflicts --- .env.dev | 4 ---- symfony.lock | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 .env.dev diff --git a/.env.dev b/.env.dev deleted file mode 100644 index 743e182a..00000000 --- a/.env.dev +++ /dev/null @@ -1,4 +0,0 @@ - -###> symfony/framework-bundle ### -APP_SECRET=c9798d38335165263bcb913df2c4a79c -###< symfony/framework-bundle ### diff --git a/symfony.lock b/symfony.lock index 03c06d0d..516e1c26 100644 --- a/symfony.lock +++ b/symfony.lock @@ -225,12 +225,12 @@ ] }, "symfony/framework-bundle": { - "version": "7.2", + "version": "7.1", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", - "version": "7.2", - "ref": "87bcf6f7c55201f345d8895deda46d2adbdbaa89" + "version": "7.0", + "ref": "6356c19b9ae08e7763e4ba2d9ae63043efc75db5" }, "files": [ "config/packages/cache.yaml",