Resolved Conflicts

IMISSHER99 · Jun 15, 2024 · 649aea3 · 649aea3
2 parents a8b0ab7 + 7dcc92d
commit 649aea3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/_drizzle/schema.ts b/app/_drizzle/schema.ts
@@ -38,4 +38,4 @@ export const subLinkRelations = relations(subLinks, ({ one }) => ({
         fields: [subLinks.linkId],
         references: [links.id]
     })
-}))
+}))
diff --git a/app/_types/navigation.types.ts b/app/_types/navigation.types.ts
@@ -1,3 +1,4 @@
+
 export type NavigationData = {
     name: string,
     svgIconName: string,
-Original file line number
+Diff line change
@@ Expand Up @@
             fields: [subLinks.linkId],
             references: [links.id]
         })
-    }))
+    }))