mirror of
https://github.com/ansible/awx.git
synced 2026-02-20 12:40:06 -03:30
Fix merge conflicts
This commit is contained in:
@@ -18,10 +18,6 @@ import {
|
||||
withRouter
|
||||
} from 'react-router-dom';
|
||||
|
||||
import {
|
||||
PlusIcon,
|
||||
} from '@patternfly/react-icons';
|
||||
|
||||
import { withNetwork } from '../../../contexts/Network';
|
||||
|
||||
import AlertModal from '../../../components/AlertModal';
|
||||
|
||||
Reference in New Issue
Block a user