fix conflicts

taylorotwell · taylorotwell · commit 169dd5e722a4 · 2025-02-25T11:24:49.000-07:00
diff --git a/resources/css/app.css b/resources/css/app.css
@@ -4,7 +4,8 @@
 
 body,
 html {
-    --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+    --font-sans:
+        'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
 
 @layer base {
diff --git a/resources/js/components/NavMain.vue b/resources/js/components/NavMain.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { SidebarGroup, SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
-import { type SharedData, type NavItem } from '@/types';
+import { type NavItem, type SharedData } from '@/types';
 import { Link, usePage } from '@inertiajs/vue3';
 
 defineProps<{

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`
`5`	`5`	`body,`
`6`	`6`	`html {`
`7`		`- --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';`
	`7`	`+ --font-sans:`
	`8`	`+ 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`@layer base {`