Fixed merge conflicts

This commit is contained in:
Harshan Liyanage 2017-04-04 16:13:30 +05:30
commit 004a70f0e1

View File

@ -96,6 +96,10 @@ var operationModule = function () {
if (formParams) {
operations[op]["uiParams"] = formParams;
}
// var icon = utility.getOperationIcon(deviceType, iconIdentifier);
// if (icon) {
// log.error("icon found : " + icon );
// operations[op]["icon"] = icon;
}
}
return operations;