fix Merge conflict.

This commit is contained in:
Ahmed Bouhuolia
2020-03-26 14:02:52 +02:00
parent ae29d20cc9
commit 6fd1afaba7
25 changed files with 923 additions and 454 deletions

View File

@@ -24,17 +24,14 @@ export default function SidebarMenu() {
children={children}
dropdownType={item.dropdownType || 'collapse'}
onClick={() => {
history.push(item.href);
if (item.href) {
history.push(item.href);
}
}} />
);
});
};
const items = menuItemsMapper(sidebarMenuList);
return (
<Menu className="sidebar-menu">
{items}
</Menu>
)
return (<Menu className="sidebar-menu">{items}</Menu>);
};