diff --git a/app.vue b/app.vue index ee186a3..334deeb 100644 --- a/app.vue +++ b/app.vue @@ -3,6 +3,7 @@ const config = useRuntimeConfig() const apiBase = config.public.apiBase import k_logo from '@/assets/icons/logo.svg' +<<<<<<< HEAD type ApiKpType = { id: number @@ -47,6 +48,8 @@ type ApiSocial_networkType = { } +======= +>>>>>>> 438d53218ae0250dd90d13cc3a67f9d559db2b0c import '@/assets/main.scss' const { data: seoData } = await useFetch(`${apiBase}/kp/1`) @@ -133,7 +136,8 @@ const toggleModal = () => {