We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 8e019f5 commit dd161e3Copy full SHA for dd161e3
components/translation/introduction.rst
@@ -62,11 +62,17 @@ The Translation component uses Loader classes to load catalogs. You can load
62
multiple resources for the same locale, which will then be combined into one
63
catalog.
64
65
+<<<<<<< HEAD
66
.. versionadded:: 2.4
67
The ``JsonFileLoader`` was introduced in Symfony 2.4.
68
69
The component comes with some default Loaders and you can create your own
70
Loader too. The default loaders are:
71
+=======
72
+The component comes with some default Loaders and you can
73
+:doc:`create your own Loader too</components/translation/custom_formats>`. The
74
+default loaders are:
75
+>>>>>>> Link from introduction section
76
77
* :class:`Symfony\\Component\\Translation\\Loader\\ArrayLoader` - to load
78
catalogs from PHP arrays.
0 commit comments