fix: merge conflicts

veops · Dec 3, 2024 · f5b5f00 · f5b5f00
2 parents 191ce95 + ff9fb85
commit f5b5f00
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmdb-ui/.env b/cmdb-ui/.env
@@ -1,6 +1,6 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=/api
+VUE_APP_API_BASE_URL=http://127.0.0.1:5000/api
 VUE_APP_BUILD_PACKAGES="ticket,calendar,acl"
 VUE_APP_IS_OUTER=true
 VUE_APP_IS_OPEN_SOURCE=true
diff --git a/docs/README_en.md b/docs/README_en.md
@@ -1,5 +1,6 @@
 
 <h2 align="center">Simple, lightweight, and versatile operational CMDB</h2>
+
 <p align="center">
   <a href="https://github.com/veops/cmdb/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-AGPLv3-brightgreen" alt="License: GPLv3"></a>
   <a href="https:https://github.com/sendya/ant-design-pro-vue"><img src="https://img.shields.io/badge/UI-Ant%20Design%20Pro%20Vue-brightgreen" alt="UI"></a>
@@ -98,4 +99,3 @@ docker compose up -d
 4. Push to the branch (`git push origin my-feature`)
 5. Create new Pull Request
 
----