resolve conflicts

2026-06-23 15:25:19 +02:00 · 2026-06-23 15:25:19 +02:00 · 36d3926c85
commit 36d3926c85
parent 3a31db33e9
16 changed files with 172 additions and 288 deletions
--- a/site/snippets/header.php
+++ b/site/snippets/header.php
@ -27,6 +27,5 @@
        </ul>
      </nav>
    </div>
-
  </header>
  <main>