Resolved Conflicts

IMISSHER99 · Jun 15, 2024 · cf25ae0 · cf25ae0
2 parents 94fbf5e + 4801334
commit cf25ae0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
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,4 +1,3 @@
-
 export type NavigationData = {
     name: string,
     svgIconName: string,
-Original file line number
+Diff line change
@@ Expand Up @@
             fields: [subLinks.linkId],
             references: [links.id]
         })
-    }))
+    }))