тестd32

frontend/src/plugins/axios.ts

@@ -1,8 +1,7 @@
-<<<<<<< HEAD
 import axios from 'axios'
 
 const axiosInstance = axios.create({
-  baseURL: import.meta.env.VITE_API_URL || '/api',
+  baseURL: '/api',
   timeout: 5000,
   headers: {
     'Content-Type': 'application/json',
@@ -35,7 +34,4 @@ axiosInstance.interceptors.response.use(
   }
 )
 
-export default axiosInstance 
-=======
- 
->>>>>>> my-feature-branch
+export default axiosInstance