Skip to content

E
evm-store
Commit 65402844 authored by wanli's avatar wanli
Browse files
Options

update

parent bce82889
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
.gitattributes
View file @ 65402844
backend/config.ini merge=ours
frontend/src/views/system/monitor.vue merge=ours
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment