Browse Source

import 충돌 수정

pull/2/head
이학준 2 years ago
parent
commit
1227ef3f9b
  1. 2
      src/containers/basis/group/BasisGroupApprovalContainer.js

2
src/containers/basis/group/BasisGroupApprovalContainer.js

@ -6,7 +6,7 @@ import { BasisGroupApprovalSearch } from '../../../components/basis/group/BasisG
import { CustomMainLayout } from '../../../components/layout/CustomMainLayout'; import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
import { ConfirmModal } from '../../../components/modal/ConfirmModal'; import { ConfirmModal } from '../../../components/modal/ConfirmModal';
import * as Actions from '../../../modules/basis/group/actions/basisGroupAction'; import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
// import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction'; import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction';
import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid'; import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid';
export const BasisGroupApprovalContainer = props => { export const BasisGroupApprovalContainer = props => {

Loading…
Cancel
Save