From 85631ad823521fb339aa696f80cc91af9bb016c0 Mon Sep 17 00:00:00 2001
From: Mo Tarbin <mhed.t91@gmail.com>
Date: Sun, 3 Nov 2024 23:46:48 -0500
Subject: [PATCH] fix merging commit

---
 src/views/Chores/ChoreCard.jsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/Chores/ChoreCard.jsx b/src/views/Chores/ChoreCard.jsx
index b7e2709..31b95ba 100644
--- 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'>