fix merge
This commit is contained in:
parent
d7061126cd
commit
57d2aa3c9f
|
@ -160,7 +160,7 @@ import XSensitive from '@/components/MkTutorial.Sensitive.vue';
|
||||||
import XPrivacySettings from '@/components/MkTutorial.PrivacySettings.vue';
|
import XPrivacySettings from '@/components/MkTutorial.PrivacySettings.vue';
|
||||||
import MkAnimBg from '@/components/MkAnimBg.vue';
|
import MkAnimBg from '@/components/MkAnimBg.vue';
|
||||||
import { instance } from '@/instance.js';
|
import { instance } from '@/instance.js';
|
||||||
import { host } from '@/config.js';
|
import { host } from '@@/js/config.js';
|
||||||
import { claimAchievement } from '@/scripts/achievements.js';
|
import { claimAchievement } from '@/scripts/achievements.js';
|
||||||
|
|
||||||
import type { Component } from 'vue';
|
import type { Component } from 'vue';
|
||||||
|
|
|
@ -117,7 +117,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
|
||||||
import { reactionPicker } from '@/scripts/reaction-picker.js';
|
import { reactionPicker } from '@/scripts/reaction-picker.js';
|
||||||
import { i18n } from '@/i18n.js';
|
import { i18n } from '@/i18n.js';
|
||||||
import { instance } from '@/instance.js';
|
import { instance } from '@/instance.js';
|
||||||
import { host } from '@/config.js';
|
import { host } from '@@/js/config.js';
|
||||||
import { confirm as osConfirm } from '@/os.js';
|
import { confirm as osConfirm } from '@/os.js';
|
||||||
|
|
||||||
import MkAnimBg from '@/components/MkAnimBg.vue';
|
import MkAnimBg from '@/components/MkAnimBg.vue';
|
||||||
|
|
Loading…
Reference in New Issue