Yimaru/Yimaru-Admin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflict fix

Browse Source
This commit is contained in:
Yared Yemane 2026-02-27 06:50:15 -08:00
commit cb4796e8d5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -1,2 +1,2 @@
VITE_API_BASE_URL=http://localhost:8080/api/v1 VITE_API_BASE_URL=http://api.yimaru.yaltopia.com/
VITE_GOOGLE_CLIENT_ID= VITE_GOOGLE_CLIENT_ID=

3
.gitignore vendored
View File

@ -12,6 +12,9 @@ dist
dist-ssr dist-ssr
*.local *.local
# Environment files
.env
# Editor directories and files # Editor directories and files
.vscode/* .vscode/*
!.vscode/extensions.json !.vscode/extensions.json