mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Fixed merge conflicts
This commit is contained in:
commit
004a70f0e1
@ -96,6 +96,10 @@ var operationModule = function () {
|
|||||||
if (formParams) {
|
if (formParams) {
|
||||||
operations[op]["uiParams"] = formParams;
|
operations[op]["uiParams"] = formParams;
|
||||||
}
|
}
|
||||||
|
// var icon = utility.getOperationIcon(deviceType, iconIdentifier);
|
||||||
|
// if (icon) {
|
||||||
|
// log.error("icon found : " + icon );
|
||||||
|
// operations[op]["icon"] = icon;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return operations;
|
return operations;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user