resolve conflicts

This commit is contained in:
2025-06-19 07:28:29 +02:00
403 changed files with 100820 additions and 3088 deletions

View File

@@ -5,7 +5,7 @@
<link rel="stylesheet" href="/public/css/main.css" />
<!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
<script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
<script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
</head>
<body class="h-full">
<div class="min-h-full flex flex-col justify-center py-12 sm:px-6 lg:px-8 h-">
@@ -37,4 +37,4 @@
</div>
</body>
</html>
{{end}}
{{end}}