Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9056860

Browse files
committed
fixed bad merge
1 parent 5140c33 commit 9056860

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,13 @@
7474
"symfony/form": "<4.4",
7575
"symfony/lock": "<4.4",
7676
"symfony/mailer": "<4.4",
77-
<<<<<<< HEAD
7877
"symfony/messenger": "<4.4",
78+
"symfony/mime": "<4.4",
7979
"symfony/property-info": "<4.4",
8080
"symfony/serializer": "<4.4",
8181
"symfony/stopwatch": "<4.4",
8282
"symfony/translation": "<4.4",
8383
"symfony/twig-bridge": "<4.4",
84-
=======
85-
"symfony/messenger": "<4.3",
86-
"symfony/mime": "<4.4",
87-
"symfony/property-info": "<3.4",
88-
"symfony/serializer": "<4.2",
89-
"symfony/stopwatch": "<3.4",
90-
"symfony/translation": "<4.3",
91-
"symfony/twig-bridge": "<4.1.1",
92-
>>>>>>> 4.4
9384
"symfony/twig-bundle": "<4.4",
9485
"symfony/validator": "<4.4",
9586
"symfony/workflow": "<4.4"

0 commit comments

Comments
 (0)