fix conflicts

new-ui/projects/vue-admin/env.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="vite/client" />
+declare module "*.vue" {
+  import { DefineComponent } from "vue";
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
+}
+
+declare const __AUTH_KEY: string;