solve conflict
This commit is contained in:
parent
b073384fc7
commit
eff03741b2
|
|
@ -36,7 +36,7 @@ import NewAndEditDialog from '../NewAndEditDialog';
|
||||||
|
|
||||||
const toJS = mobx.toJS;
|
const toJS = mobx.toJS;
|
||||||
const confirm = Modal.confirm;
|
const confirm = Modal.confirm;
|
||||||
//const WeaTable = WeaTableNew.WeaTable;
|
//const WeaTable = WeaTableNew.WeaTable
|
||||||
|
|
||||||
|
|
||||||
@inject('company')
|
@inject('company')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue