|
|
@@ -1,6 +1,7 @@
|
|
|
<!DOCTYPE html>
|
|
|
<html>
|
|
|
<head>
|
|
|
+<<<<<<< ours
|
|
|
<meta charset="UTF-8" />
|
|
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
|
<title>{% block title %}Videothèque{% endblock %}</title>
|
|
|
@@ -34,5 +35,21 @@
|
|
|
|
|
|
{{ encore_entry_script_tags('app') }}
|
|
|
{% block javascripts %}{% endblock %}
|
|
|
+=======
|
|
|
+ <meta charset="UTF-8">
|
|
|
+ <title>{% block title %}Welcome!{% endblock %}</title>
|
|
|
+ <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text></svg>">
|
|
|
+ {# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #}
|
|
|
+ {% block stylesheets %}
|
|
|
+ {{ encore_entry_link_tags('app') }}
|
|
|
+ {% endblock %}
|
|
|
+
|
|
|
+ {% block javascripts %}
|
|
|
+ {{ encore_entry_script_tags('app') }}
|
|
|
+ {% endblock %}
|
|
|
+ </head>
|
|
|
+ <body>
|
|
|
+ {% block body %}{% endblock %}
|
|
|
+>>>>>>> theirs
|
|
|
</body>
|
|
|
</html>
|
