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

@@ -1,18 +1,16 @@
import React from 'react';
import classnames from 'classnames';
import { Navbar } from "@blueprintjs/core";
import { Navbar } from '@blueprintjs/core';
export default function DashboardActionsBar({
children, name
}) {
export default function DashboardActionsBar({ children, name }) {
return (
<div className={classnames({
'dashboard__actions-bar': true,
[`dashboard__actions-bar--${name}`]: !!name,
})}>
<Navbar className="navbar--dashboard-actions-bar">
{ children }
</Navbar>
<div
className={classnames({
'dashboard__actions-bar': true,
[`dashboard__actions-bar--${name}`]: !!name
})}
>
<Navbar className='navbar--dashboard-actions-bar'>{children}</Navbar>
</div>
);
}
}