fixing the rebase
This commit is contained in:
@@ -305,19 +305,4 @@ const AsyncDashboard2 = ({}): JSX.Element => {
|
||||
);
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
<DashboardWrapperLayout>
|
||||
<AsyncDashboardInner />
|
||||
</DashboardWrapperLayout>
|
||||
|
||||
|
||||
)
|
||||
|
||||
|
||||
}
|
||||
|
||||
export default AsyncDashboard2
|
||||
=======
|
||||
export default AsyncDashboard2;
|
||||
>>>>>>> b24fbf2 (update button based on state)
|
||||
|
||||
Reference in New Issue
Block a user