Fix merge conflicts
This commit is contained in:
commit
9730aa7816
22 files changed
+408
-3
No files matched your search
@@ -27,7 +27,13 @@ export const MessageCard = ({ classes, message, children }) => (
|
||||
<Card className={classes.card}>
|
||||
<div className={classes.cardDetails}>
|
||||
<CardContent className={classes.cardContent}>
|
||||
<<<<<<< HEAD
|
||||
<Typography variant='headline' align='center' gutterBottom>{message}</Typography>
|
||||
=======
|
||||
<Typography variant='headline' align='center' gutterBottom>
|
||||
{message}
|
||||
</Typography>
|
||||
>>>>>>> feature/client-refactor-react
|
||||
{children}
|
||||
</CardContent>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user