fix merging commit

2024-11-03 23:46:48 -05:00
parent fc0f2fa2a1
commit 85631ad823
1 changed files with 0 additions and 4 deletions
--- a/src/views/Chores/ChoreCard.jsx
+++ b/src/views/Chores/ChoreCard.jsx
@@ -446,11 +446,7 @@ const ChoreCard = ({
              </Avatar>
              <Box display='flex' flexDirection='column'>
                <Typography level='title-md'>{getName(chore.name)}</Typography>
-<<<<<<< HEAD
-                {chore.assignedTo !== userProfile.id && (
-=======
                {userProfile && chore.assignedTo !== userProfile.id && (
->>>>>>> dev
                  <Typography level='body-md' color='text.disabled'>
                    Assigned to{' '}
                    <Chip variant='outlined'>