minor #18169 Fix leftover conflict marker in UPGRADE-3.0.md (guilliamxavier)
minor #18169 Fix leftover conflict marker in UPGRADE-3.0.md (guilliamxavier)

This PR was merged into the 3.0 branch.

Discussion
----------

Fix leftover conflict marker in UPGRADE-3.0.md

| Q             | A
| ------------- | ---
| Branch        | 3.0
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   |
| Fixed tickets |
| License       | MIT
| Doc PR        |

Presumably after resolving a merge conflict, a parasite line `>>>>>>> 2.8` was introduced as part of commit 67df429d99c1cf55227f8bb065f88872e5b3edeb:
* https://github.com/symfony/symfony/commit/67df429d99c1cf55227f8bb065f88872e5b3edeb#diff-0901ceb76939b17cd920bc69aa52d21fR406
* https://github.com/symfony/symfony/blame/67df429d99c1cf55227f8bb065f88872e5b3edeb/UPGRADE-3.0.md#L406

The present PR just deletes this line 406.

Commits
-------

b47220a Fix leftover conflict marker in UPGRADE-3.0.md

dmaicher/symfony,pierredup/symfony,vincentaubert/symfony,MatTheCat/symfony,dosten/symfony,frankdejonge/symfony,zorn-v/symfony,csarrazi/symfony,phramz/symfony,Deamon/symfony,josephdpurcell/symfony,jjanvier/symfony,mweimerskirch/symfony,gnat42/symfony,mickaelandrieu/symfony,apetitpa/symfony,jjanvier/symfony,mweimerskirch/symfony,MatTheCat/symfony,ogizanagi/symfony,zcodes/symfony,dunglas/symfony,gencer/symfony,georaldc/symfony,lstrojny/symfony,jakzal/symfony,damienalexandre/symfony,michaelperrin/symfony,danionut90/symfony,fabpot/symfony,jakzal/symfony,mpdude/symfony,apfelbox/symfony,MisatoTremor/symfony,Triiistan/symfony,zerkms/symfony,romaricdrigon/symfony,smatyas/symfony,Tobion/symfony,dbu/symfony,docteurklein/symfony,codeclimate-testing/symfony,weaverryan/symfony,curry684/symfony,hacfi/symfony,jean-gui/symfony,dbu/symfony,fabpot/symfony,HeahDude/symfony,mweimerskirch/symfony,symfony/symfony,Ener-Getick/symfony,derrabus/symfony,okdana/symfony,smatyas/symfony,phramz/symfony,DavidGarciaCat/symfony,Taluu/symfony,Padam87/symfony,ro0NL/symfony,realityking/symfony,Taluu/symfony,jameshalsall/symfony,symfony/symfony,believer-ufa/symfony,tgalopin/symfony,Taluu/symfony,frankdejonge/symfony,localheinz/symfony,hhamon/symfony,Simperfit/symfony,d-ph/symfony,hacfi/symfony,jderusse/symfony,Tobion/symfony,gnat42/symfony,okdana/symfony,klandaika/symfony,jvasseur/symfony,geoffrey-brier/symfony,Deamon/symfony,mnapoli/symfony,dunglas/symfony,garak/symfony,Aliance/symfony,kbond/symfony,geoffrey-brier/symfony,Einenlum/symfony,chrisguitarguy/symfony,HeahDude/symfony,alekitto/symfony,sgehrig/symfony,OskarStark/symfony,Padam87/symfony,zcodes/symfony,stof/symfony,michaelperrin/symfony,csarrazi/symfony,pix-art/symfony,unexge/symfony,believer-ufa/symfony,d-ph/symfony,ro0NL/symfony,aeoris/symfony,aeoris/symfony,localheinz/symfony,patrick-mcdougle/symfony,dosten/symfony,chrisguitarguy/symfony,Nyholm/symfony,garak/symfony,MisatoTremor/symfony,curry684/symfony,romainneutron/symfony,yceruto/symfony,nicolas-grekas/symfony,stof/symfony,gonzalovilaseca/symfony,ogizanagi/symfony,nicolas-grekas/symfony,nasimnabavi/symfony,iltar/symfony,apetitpa/symfony,alekitto/symfony,georaldc/symfony,gimler/symfony,weaverryan/symfony,chalasr/symfony,Triiistan/symfony,joelwurtz/symfony,WouterJ/symfony,vincentaubert/symfony,MisatoTremor/symfony,weaverryan/symfony,curry684/symfony,Amo/symfony,jpauli/symfony,klandaika/symfony,c960657/symfony,natechicago/symfony,e-moe/symfony,Engerim/symfony,pix-art/symfony,jjanvier/symfony,apfelbox/symfony,ragboyjr/symfony,danionut90/symfony,pix-art/symfony,jakzal/symfony,OskarStark/symfony,DavidGarciaCat/symfony,sstok/symfony,teohhanhui/symfony,yceruto/symfony,pierredup/symfony,derrabus/symfony,paradajozsef/symfony,pyrech/symfony,weaverryan/symfony,iltar/symfony,zorn-v/symfony,tucksaun/symfony,fabpot/symfony,apfelbox/symfony,nasimnabavi/symfony,Pierstoval/symfony,k0pernikus/symfony,Amo/symfony,iltar/symfony,ewgRa/symfony,docteurklein/symfony,lepiaf/symfony,jpauli/symfony,GuilhemN/symfony,chalasr/symfony,1ed/symfony,ogizanagi/symfony,realityking/symfony,derrabus/symfony,bendavies/symfony,ragboyjr/symfony,mickaelandrieu/symfony,dosten/symfony,k0pernikus/symfony,Ener-Getick/symfony,lyrixx/symfony,geoffrey-brier/symfony,jpauli/symfony,Pierstoval/symfony,pyrech/symfony,jean-gui/symfony,e-moe/symfony,natechicago/symfony,aeoris/symfony,Strate/symfony,apetitpa/symfony,mpdude/symfony,frankdejonge/symfony,patrick-mcdougle/symfony,mnapoli/symfony,realityking/symfony,havvg/symfony,lemoinem/symfony,gencer/symfony,jameshalsall/symfony,c960657/symfony,Tobion/symfony,paradajozsef/symfony,Slamdunk/symfony,klandaika/symfony,pamil/symfony,andreia/symfony,realityking/symfony,Amo/symfony,jean-gui/symfony,fabpot/symfony,bendavies/symfony,sstok/symfony,k0pernikus/symfony,sroze/symfony,bendavies/symfony,jvasseur/symfony,Nyholm/symfony,lemoinem/symfony,chalasr/symfony,pix-art/symfony,romaricdrigon/symfony,codeclimate-testing/symfony,dosten/symfony,WouterJ/symfony,Amo/symfony,pix-art/symfony,Triiistan/symfony,realityking/symfony,romainneutron/symfony,yceruto/symfony,dbu/symfony,backbone87/symfony,dmaicher/symfony,gnat42/symfony,hason/symfony,havvg/symfony,symfony/symfony,localheinz/symfony,smatyas/symfony,nicolas-grekas/symfony,oleg-andreyev/symfony,joelwurtz/symfony,arjenm/symfony,georaldc/symfony,jpauli/symfony,jzawadzki/symfony,deguif/symfony,gimler/symfony,jean-gui/symfony,chrisguitarguy/symfony,dzuelke/symfony,romainneutron/symfony,garak/symfony,hhamon/symfony,pierredup/symfony,WhiteEagle88/symfony,GuilhemN/symfony,zorn-v/symfony,jderusse/symfony,deguif/symfony,sgehrig/symfony,neemzy/symfony,lyrixx/symfony,zcodes/symfony,natechicago/symfony,stof/symfony,apfelbox/symfony,Strate/symfony,kbond/symfony,joelwurtz/symfony,Padam87/symfony,MisatoTremor/symfony,Simperfit/symfony,jameshalsall/symfony,geoffrey-brier/symfony,apetitpa/symfony,gimler/symfony,damienalexandre/symfony,zerkms/symfony,nasimnabavi/symfony,deguif/symfony,stof/symfony,ajgarlag/symfony,okdana/symfony,tgalopin/symfony,1ed/symfony,unexge/symfony,jjanvier/symfony,dzuelke/symfony,jderusse/symfony,lstrojny/symfony,yceruto/symfony,backbone87/symfony,ro0NL/symfony,alekitto/symfony,sgehrig/symfony,michaelperrin/symfony,smatyas/symfony,lyrixx/symfony,teohhanhui/symfony,ewgRa/symfony,mpdude/symfony,believer-ufa/symfony,sgehrig/symfony,danionut90/symfony,natechicago/symfony,tgalopin/symfony,OskarStark/symfony,believer-ufa/symfony,gnat42/symfony,Deamon/symfony,neemzy/symfony,Einenlum/symfony,mickaelandrieu/symfony,Tobion/symfony,dunglas/symfony,kbond/symfony,andrerom/symfony,dmaicher/symfony,maidmaid/symfony,HeahDude/symfony,Slamdunk/symfony,ragboyjr/symfony,maidmaid/symfony,maidmaid/symfony,Ener-Getick/symfony,dzuelke/symfony,pamil/symfony,romainneutron/symfony,bendavies/symfony,Pierstoval/symfony,andreia/symfony,unexge/symfony,codeclimate-testing/symfony,e-moe/symfony,teohhanhui/symfony,jzawadzki/symfony,geoffrey-brier/symfony,jakzal/symfony,phramz/symfony,xabbuh/symfony,GuilhemN/symfony,Slamdunk/symfony,Taluu/symfony,jvasseur/symfony,vincentaubert/symfony,DavidGarciaCat/symfony,arjenm/symfony,klandaika/symfony,Koc/symfony,docteurklein/symfony,andrerom/symfony,backbone87/symfony,klandaika/symfony,hason/symfony,MatTheCat/symfony,shieldo/symfony,WouterJ/symfony,Nyholm/symfony,tucksaun/symfony,andreia/symfony,Simperfit/symfony,pierredup/symfony,1ed/symfony,docteurklein/symfony,romaricdrigon/symfony,sroze/symfony,georaldc/symfony,deguif/symfony,georaldc/symfony,voronkovich/symfony,jpauli/symfony,chrisguitarguy/symfony,Koc/symfony,Simperfit/symfony,Triiistan/symfony,shieldo/symfony,chrisguitarguy/symfony,docteurklein/symfony,lepiaf/symfony,jameshalsall/symfony,zorn-v/symfony,jpauli/symfony,sroze/symfony,Aliance/symfony,hhamon/symfony,ewgRa/symfony,mnapoli/symfony,gencer/symfony,georaldc/symfony,josephdpurcell/symfony,patrick-mcdougle/symfony,Nyholm/symfony,gimler/symfony,ogizanagi/symfony,sroze/symfony,voronkovich/symfony,ajgarlag/symfony,lemoinem/symfony,lepiaf/symfony,phramz/symfony,sstok/symfony,localheinz/symfony,romainneutron/symfony,romaricdrigon/symfony,unexge/symfony,geoffrey-brier/symfony,josephdpurcell/symfony,tucksaun/symfony,mnapoli/symfony,Deamon/symfony,apfelbox/symfony,Aliance/symfony,realityking/symfony,csarrazi/symfony,dmaicher/symfony,damienalexandre/symfony,patrick-mcdougle/symfony,tucksaun/symfony,unexge/symfony,maidmaid/symfony,oleg-andreyev/symfony,derrabus/symfony,Einenlum/symfony,OskarStark/symfony,e-moe/symfony,HeahDude/symfony,joelwurtz/symfony,jzawadzki/symfony,hacfi/symfony,symfony/symfony,lyrixx/symfony,Ener-Getick/symfony,jameshalsall/symfony,shieldo/symfony,zcodes/symfony,Ener-Getick/symfony,vincentaubert/symfony,havvg/symfony,mnapoli/symfony,chalasr/symfony,gonzalovilaseca/symfony,pamil/symfony,dzuelke/symfony,k0pernikus/symfony,Triiistan/symfony,ragboyjr/symfony,jjanvier/symfony,ajgarlag/symfony,paradajozsef/symfony,sstok/symfony,pamil/symfony,xabbuh/symfony,nasimnabavi/symfony,WhiteEagle88/symfony,ro0NL/symfony,mickaelandrieu/symfony,Koc/symfony,MisatoTremor/symfony,GuilhemN/symfony,oleg-andreyev/symfony,believer-ufa/symfony,pyrech/symfony,MisatoTremor/symfony,smatyas/symfony,dzuelke/symfony,jvasseur/symfony,xabbuh/symfony,Deamon/symfony,patrick-mcdougle/symfony,pix-art/symfony,Engerim/symfony,Simperfit/symfony,damienalexandre/symfony,curry684/symfony,zerkms/symfony,voronkovich/symfony,danionut90/symfony,alekitto/symfony,Ener-Getick/symfony,lemoinem/symfony,sstok/symfony,andreia/symfony,nicolas-grekas/symfony,Padam87/symfony,MatTheCat/symfony,Engerim/symfony,Strate/symfony,d-ph/symfony,oleg-andreyev/symfony,voronkovich/symfony,Einenlum/symfony,Pierstoval/symfony,arjenm/symfony,havvg/symfony,mweimerskirch/symfony,andrerom/symfony,andrerom/symfony,teohhanhui/symfony,gonzalovilaseca/symfony,d-ph/symfony,iltar/symfony,neemzy/symfony,believer-ufa/symfony,ewgRa/symfony,natechicago/symfony,dosten/symfony,dbu/symfony,dbu/symfony,hhamon/symfony,paradajozsef/symfony,mickaelandrieu/symfony,natechicago/symfony,hason/symfony,pyrech/symfony,zerkms/symfony,Slamdunk/symfony,garak/symfony,shieldo/symfony,ewgRa/symfony,frankdejonge/symfony,c960657/symfony,GuilhemN/symfony,ajgarlag/symfony,Amo/symfony,k0pernikus/symfony,codeclimate-testing/symfony,tgalopin/symfony,lstrojny/symfony,kbond/symfony,arjenm/symfony,mweimerskirch/symfony,xabbuh/symfony,havvg/symfony,jderusse/symfony,michaelperrin/symfony,danionut90/symfony,danionut90/symfony,gonzalovilaseca/symfony,lemoinem/symfony,WhiteEagle88/symfony,ewgRa/symfony,mpdude/symfony,Koc/symfony,c960657/symfony,Padam87/symfony,1ed/symfony