Skip to content

Commit

Permalink
Test: add conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
robertSt7 committed Oct 23, 2023
1 parent 42b6cfa commit e7a7bc6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
"symfony/symfony": "*",
"doctrine/doctrine-migrations-bundle": "3.1.0",
"sabre/dav": "4.2.2",
"thecodingmachine/safe": "<2.0"
"thecodingmachine/safe": "<2.0",
"pimcore/admin-ui-classic-bundle": "<1.2"
},
"require-dev": {
"codeception/codeception": "^5.0.3",
Expand Down

0 comments on commit e7a7bc6

Please sign in to comment.