fix: Merge conflict

armada-ths · Apr 11, 2024 · 5f68d65 · 5f68d65
1 parent 8f7b201
commit 5f68d65
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/app/student/recruitment/page.tsx b/src/app/student/recruitment/page.tsx
@@ -77,9 +77,6 @@ export default async function RecruitmentPage() {
 										<AccordionItem key={role.name} value={role.name}>
 											<AccordionTrigger>{role.name}</AccordionTrigger>
 											<AccordionContent>
-<<<<<<< Updated upstream
-												<P className="leading-7">{role.description}</P>
-=======
 												{role.description.split("\n").map(line =>
 													line.trimStart().startsWith("#") ? (
 														<P
@@ -93,7 +90,6 @@ export default async function RecruitmentPage() {
 														</P>
 													)
 												)}
->>>>>>> Stashed changes
 											</AccordionContent>
 										</AccordionItem>
 									))}