Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit 9ce082c2cd8c · 2023-01-26T13:42:53.000+01:00
* 6.0:
  [Misc] Fixed remaining `HEAD`
diff --git a/configuration.rst b/configuration.rst
@@ -84,23 +84,6 @@ readable. These are the main advantages and disadvantages of each format:
 
         The automatic loading of PHP configuration files was introduced in Symfony 6.1.
 
-<<<<<<< HEAD
-=======
-There isn't any practical difference between formats. In fact, Symfony
-transforms and caches all of them into PHP before running the application, so
-there's not even any performance difference between them.
-
-YAML is used by default when installing packages because it's concise and very
-readable. These are the main advantages and disadvantages of each format:
-
-* **YAML**: simple, clean and readable, but not all IDEs support autocompletion
-  and validation for it. :ref:`Learn the YAML syntax <yaml-format>`;
-* **XML**: autocompleted/validated by most IDEs and is parsed natively by PHP,
-  but sometimes it generates configuration considered too verbose. `Learn the XML syntax`_;
-* **PHP**: very powerful and it allows you to create dynamic configuration with
-  arrays or a :ref:`ConfigBuilder <config-config-builder>`.
-
->>>>>>> 5.4
 Importing Configuration Files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/contributing/code/pull_requests.rst b/contributing/code/pull_requests.rst
@@ -505,11 +505,7 @@ PR. Before re-submitting the PR, rebase with ``upstream/6.x`` or
 
 .. code-block:: terminal
 
-<<<<<<< HEAD
-    $ git rebase -f upstream/6.1
-=======
     $ git rebase -f upstream/6.x
->>>>>>> 5.4
     $ git push --force origin BRANCH_NAME
 
 .. note::
