.gitattributes

backend/config.ini merge=ours
frontend/vue.config.js merge=ours
frontend/src/views/system/monitor.vue merge=ours