Skip to content

Commit 8dd9c1f

Browse files
committed
fix final merge conflict 'RouterNames' renamed to 'RouteNames'
1 parent 34a9cd7 commit 8dd9c1f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
232232
import { mapActions, mapGetters, mapState } from 'vuex';
233233
import get from 'lodash/get';
234-
import { RouterNames, viewModes, DraggableRegions, DraggableUniverses } from '../constants';
234+
import { RouteNames, viewModes, DraggableRegions, DraggableUniverses } from '../constants';
235235
import ResourceDrawer from '../components/ResourceDrawer';
236236
import ContentNodeOptions from '../components/ContentNodeOptions';
237237
import MoveModal from '../components/move/MoveModal';

contentcuration/contentcuration/frontend/channelList/views/Channel/ChannelList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
4949
import { mapGetters, mapActions } from 'vuex';
5050
import sortBy from 'lodash/sortBy';
51-
import { RouterNames, CHANNEL_PAGE_SIZE } from '../../constants';
51+
import { RouteNames, CHANNEL_PAGE_SIZE } from '../../constants';
5252
import ChannelItem from './ChannelItem';
5353
import LoadingText from 'shared/views/LoadingText';
5454
import { ChannelListTypes } from 'shared/constants';

0 commit comments

Comments
 (0)