solved merge conflicts

This commit is contained in:
Joaquin committed 2025-05-16 10:48:19 -07:00
commit 59f8677e7c
17 files changed
+261 -119

No files matched your search

+3
View File
@@ -23,5 +23,8 @@
<script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<script src="/static/scripts/footer.js"></script>
<script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
</body>
</html>