update

abb22f2a · wanli · d947b9e5 · abb22f2a · abb22f2a · abb22f2a
Commit abb22f2a authored Jun 30, 2021 by wanli
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.gitattributes .gitattributes +2 -0

backend/config.ini backend/config.ini +1 -0

frontend/src/views/system/monitor.vue frontend/src/views/system/monitor.vue +1 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+backend/config.ini merge=ours
+frontend/src/views/system/monitor.vue merge=ours
\ No newline at end of file
--- a/backend/config.ini
+++ b/backend/config.ini
@@ -22,3 +22,4 @@ evueapps_dir = evueapps
 launcher_dir = launcher
 host = 0.0.0.0
 port = 3000
--- a/frontend/src/views/system/monitor.vue
+++ b/frontend/src/views/system/monitor.vue
@@ -328,3 +328,4 @@ export default {
  }
 }
 </style>