Fix merge conflict resolution mistake

ryuapp · ryuapp · commit 8153bb2afb9c · 2024-04-09T03:33:59.000+09:00
diff --git a/frontend/components/Nav.tsx b/frontend/components/Nav.tsx
@@ -12,7 +12,7 @@ export function Nav(props: NavProps) {
     <nav
       class={`${
         props.noTopMargin ? "" : "mt-3"
-      } mt-3 md:border-b border-jsr-cyan-300/30 max-w-full flex justify-between overflow-hidden items-end`}
+      } md:border-b border-jsr-cyan-300/30 max-w-full flex justify-between overflow-hidden items-end`}
     >
       <ul id="nav-items" class="flex flex-row">
         {props.children}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export function Nav(props: NavProps) {`
`12`	`12`	`<nav`
`13`	`13`	class={`${
`14`	`14`	`props.noTopMargin ? "" : "mt-3"`
`15`		- } mt-3 md:border-b border-jsr-cyan-300/30 max-w-full flex justify-between overflow-hidden items-end`}
	`15`	+ } md:border-b border-jsr-cyan-300/30 max-w-full flex justify-between overflow-hidden items-end`}
`16`	`16`	`>`
`17`	`17`	`<ul id="nav-items" class="flex flex-row">`
`18`	`18`	`{props.children}`