Remnants/AdministrationItDepartmens
1
0
Fork 0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00
Code Activity

Merge my-feature-branch into develop with resolved conflicts

Browse Source
This commit is contained in:
MoonTestUse1
2025-01-05 00:43:13 +06:00
parent 2cff9a4e44 fb0323ba99
commit f698972f13
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/plugins/axios.ts
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
import axios from 'axios'
const axiosInstance = axios.create({
@@ -34,4 +35,7 @@ axiosInstance.interceptors.response.use(
}
)
export default axiosInstance
export default axiosInstance
=======
>>>>>>> my-feature-branch