diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.1

Browse Source 
* 4.4:
  fix merge
This commit is contained in:
Nicolas Grekas 2020-10-06 13:57:58 +02:00
commit 9f2a66871c
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
View File

@ -30,14 +30,6 @@
"/Tests/"
]
},
<<<<<<< HEAD:src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
"minimum-stability": "dev",
<<<<<<< HEAD
"version": "5.1-dev"
=======
"version": "4.4-dev"
=======
"version": "3.4-dev"
>>>>>>> 3.4:src/Symfony/Component/ClassLoader/composer.json
>>>>>>> 4.4
}

4
src/Symfony/Component/Notifier/composer.json
View File

@ -29,9 +29,5 @@
]
},
"minimum-stability": "dev",
<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
"version": "5.1-dev"
=======
"version": "4.4-dev"
>>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
}