mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 06:56:04 +02:00
Fix conflict
This commit is contained in:
+5
-5
@@ -65,11 +65,11 @@ import SimpleSwitch from './components/settings/SimpleSwitch.vue';
|
|||||||
import Location from './components/common/Location.vue';
|
import Location from './components/common/Location.vue';
|
||||||
|
|
||||||
// dialogs
|
// dialogs
|
||||||
import WorldDialog from './views/dialogs/WorldDialog.vue';
|
import WorldDialog from './views/dialogs/world/WorldDialog.vue';
|
||||||
import PreviousInstanceInfoDialog from './views/dialogs/PreviousInstanceInfoDialog.vue';
|
import PreviousInstanceInfoDialog from './views/dialogs/previousInstances/PreviousInstanceInfoDialog.vue';
|
||||||
import FriendImportDialog from './views/dialogs/FriendImportDialog.vue';
|
import FriendImportDialog from './views/dialogs/favorites/FriendImportDialog.vue';
|
||||||
import WorldImportDialog from './views/dialogs/WorldImportDialog.vue';
|
import WorldImportDialog from './views/dialogs/favorites/WorldImportDialog.vue';
|
||||||
import AvatarImportDialog from './views/dialogs/AvatarImportDialog.vue';
|
import AvatarImportDialog from './views/dialogs/favorites/AvatarImportDialog.vue';
|
||||||
import LaunchDialog from './views/dialogs/launch/LaunchDialog.vue';
|
import LaunchDialog from './views/dialogs/launch/LaunchDialog.vue';
|
||||||
import NewInstanceDialog from './views/dialogs/newInstance/NewInstanceDialog.vue';
|
import NewInstanceDialog from './views/dialogs/newInstance/NewInstanceDialog.vue';
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user