fix merge

pkg/web/components/layout.templ

@@ -39,29 +39,17 @@ templ Head(props HeadProps) {
 type HeadProps struct {
 	Links   []Link
 	Scripts []Script
-	Links   []Link
-	Scripts []Script
 }
 
 type Link struct {
 	Href string
 	Rel  string
+	As   string
 }
 
 type Script struct {
 	Src   string
 	Defer bool
-	Src   string
-	Defer bool
-}
-
-templ Head(props HeadProps) {
-	for _, link := range props.Links {
-		<link href={ link.Href } rel={ link.Rel }/>
-	}
-	for _, script := range props.Scripts {
-		<script src={ script.Src } defer={ script.Defer }></script>
-	}
 }
 
 templ Header(props HeaderProps) {
@@ -141,20 +129,15 @@ type HeaderProps struct {
 	CreateHref        string
 	SearchPlaceholder string
 	Routes            []NavRoute
-	Routes []NavRoute
 }
 
 type NavRoute struct {
 	Name string
 	Path string
-	Name string
-	Path string
 }
 
-templ Footer(props FooterProps) {
 templ Footer(props FooterProps) {
 }
 
 type FooterProps struct {
 }
-