Skip to content

Commit

Permalink
Fix recipes update conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schranz committed Jan 9, 2025
1 parent f6f4435 commit 2933027
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 0 additions & 4 deletions .env.dev

This file was deleted.

6 changes: 3 additions & 3 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 2933027

Please sign in to comment.