Fix CI

Author: OskarStark

configuration.rst

@@ -213,11 +213,7 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
                 'email_address' => param('app.admin_email'),
 
                 // ... but if you prefer it, you can also pass the name as a string
-<<<<<<< HEAD
                 // surrounded by two % (same as in YAML format) and Symfony will
-=======
-                // surrounded by two % (same as in the YAML format) and Symfony will
->>>>>>> 7.4
                 // replace it by that parameter value
                 'email_address' => '%app.admin_email%',
             ]);

setup/bundles.rst

@@ -156,4 +156,3 @@ as a starting point for your own GitHub CI configuration:
 
 .. _`Symfony releases plan`: https://symfony.com/releases
 .. _`Composer path repository option`: https://getcomposer.org/doc/05-repositories.md#path
-.. _`gromnan/symfony-config-xml-to-php`: https://github.com/GromNaN/symfony-config-xml-to-php