resolve conflict

This commit is contained in:
leonard
2025-07-29 09:36:40 +07:00
28 changed files with 2179 additions and 2892 deletions

View File

@ -10,6 +10,7 @@ import icoBulletPoint from '~/components/icons/icoBulletPoint';
import icoChevronDown from '~/components/icons/icoChevronDown';
import icoSearch from '~/components/icons/icoSearch';
import icoSend from '~/components/icons/icoSend';
import icoExpandAlt from '~/components/icons/icoExpandAlt';
import '@mdi/font/css/materialdesignicons.css'; // Ensure you are using css-loader
import 'material-design-icons-iconfont/dist/material-design-icons.css';
import Vue from 'vue';
@ -73,6 +74,9 @@ export default new Vuetify({
icoSend: {
component: icoSend,
},
icoExpandAlt: {
component: icoExpandAlt,
},
},
},
});