resolve conflict

This commit is contained in:
2026-06-02 13:08:45 -04:00
parent 086453ceea
commit f546adb1ca
5 changed files with 99 additions and 11 deletions
-6
View File
@@ -4,10 +4,4 @@ import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
plugins: [react(), tailwindcss()],
server: {
host: true,
proxy: {
'/api': 'http://localhost:3001',
},
},
})
+13
View File
@@ -0,0 +1,13 @@
import { defineConfig } from 'vite'
import react from '@vitejs/plugin-react'
import tailwindcss from '@tailwindcss/vite'
export default defineConfig({
plugins: [react(), tailwindcss()],
server: {
host: true,
proxy: {
'/api': 'http://localhost:3001',
},
},
})