Remove marker

hasparus · hasparus · commit 92aea6c60398 · 2025-06-12T17:10:02.000+02:00
diff --git a/src/app/conf/2025/speakers/[id]/page.tsx b/src/app/conf/2025/speakers/[id]/page.tsx
@@ -37,7 +37,6 @@ export function generateMetadata({ params }: SpeakerProps): Metadata {
     title: speaker.name,
     description: speaker.about,
     keywords: [...layoutMetadata.keywords, ...keywords],
-<<<<<<< HEAD
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ export function generateMetadata({ params }: SpeakerProps): Metadata {`
`37`	`37`	`title: speaker.name,`
`38`	`38`	`description: speaker.about,`
`39`	`39`	`keywords: [...layoutMetadata.keywords, ...keywords],`
`40`		`-<<<<<<< HEAD`
`41`	`40`	`}`
`42`	`41`	`}`
`43`	`42`