Merge branch '4.4' into 5.1
* 4.4: fix merge
This commit is contained in:
commit
9f2a66871c
@ -30,14 +30,6 @@
|
|||||||
"/Tests/"
|
"/Tests/"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD:src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
|
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "5.1-dev"
|
"version": "5.1-dev"
|
||||||
=======
|
|
||||||
"version": "4.4-dev"
|
|
||||||
=======
|
|
||||||
"version": "3.4-dev"
|
|
||||||
>>>>>>> 3.4:src/Symfony/Component/ClassLoader/composer.json
|
|
||||||
>>>>>>> 4.4
|
|
||||||
}
|
}
|
||||||
|
@ -29,9 +29,5 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
|
|
||||||
"version": "5.1-dev"
|
"version": "5.1-dev"
|
||||||
=======
|
|
||||||
"version": "4.4-dev"
|
|
||||||
>>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user