Fix merge conflicts

This commit is contained in:
mabashian
2019-04-23 13:27:00 -04:00
parent 5ae7cbb43a
commit 38bb4f3f3c
3 changed files with 8 additions and 20 deletions

View File

@@ -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';