Fix merge conflicts

This commit is contained in:
Barry Low committed 2018-09-17 17:08:22 -07:00
commit 9730aa7816
22 files changed
+408 -3

No files matched your search

+6
View File
@@ -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>