# Conflicts:
#	frontend/package.json
#	frontend/src/App.vue
#	frontend/src/main.ts
#	frontend/src/style.css
#	frontend/tsconfig.json
#	frontend/vite.config.ts
#	frontend/yarn.lock
#	vue_django/settings.py
#	xdc.sqlite