Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
oandregal committed Dec 4, 2023
1 parent 0c14102 commit c493dbf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/dataviews/src/filter-summary.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Children, Fragment } from '@wordpress/element';
* Internal dependencies
*/
import { OPERATOR_IN, OPERATOR_NOT_IN } from './constants';
import { unlock } from '../../lock-unlock';
import { unlock } from './lock-unlock';

const {
DropdownMenuV2: DropdownMenu,
Expand Down
14 changes: 3 additions & 11 deletions packages/edit-site/src/components/page-pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,18 @@ import { useSelect, useDispatch } from '@wordpress/data';
import {
DataViews,
ENUMERATION_TYPE,
VIEW_LAYOUTS,
OPERATOR_IN,
LAYOUT_GRID,
LAYOUT_TABLE,
OPERATOR_IN,
OPERATOR_NOT_IN,
VIEW_LAYOUTS,
} from '@wordpress/dataviews';

/**
* Internal dependencies
*/
import Page from '../page';
import Link from '../routes/link';
import {
DataViews,
VIEW_LAYOUTS,
ENUMERATION_TYPE,
LAYOUT_GRID,
LAYOUT_TABLE,
OPERATOR_IN,
OPERATOR_NOT_IN,
} from '../dataviews';
import { default as DEFAULT_VIEWS } from '../sidebar-dataviews/default-views';
import {
trashPostAction,
Expand Down

0 comments on commit c493dbf

Please sign in to comment.