conflict resolved

2024-11-25 15:37:04 +01:00
parent 54011679f1 0a6cd2b958
commit 72719df7c2
4 changed files with 8 additions and 15 deletions
--- a/templates/sortie/view.html.twig
+++ b/templates/sortie/view.html.twig
@@ -92,14 +92,6 @@
                        </a>
                    </div>
                {% endif %}
-
-{#                {% if app.user %}#}
-{#                    <div class="mt-6 flex">#}
-{#                        <a href="{{ path('sortie_inscription') }}">#}
-{#                            <button class="px-6 py-3 bg-green-500 text-white rounded-md shadow hover:bg-green-600">M'inscrire</button>#}
-{#                        </a>#}
-{#                    </div>#}
-{#                {% endif %}#}
            </div>

            <div class="lg:col-span-5 bg-white rounded-lg shadow p-6">