Skip to content

Commit d53df90

Browse files
committed
fix: resolve hidden merge conflicts in AddMembersModal list
1 parent 435a673 commit d53df90

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

‎apps/codebility/app/home/my-team/AddMembersModal.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,9 +1003,6 @@ const AddMembersModal = ({
10031003
</div>
10041004

10051005
<div className="flex-1 px-3 sm:px-6 pb-4 overflow-y-auto min-h-0">
1006-
<<<<<<< HEAD
1007-
<div className="flex flex-col gap-3 sm:gap-4">
1008-
=======
10091006
<div className="space-y-2 sm:space-y-3">
10101007
{/* Recently Added Section */}
10111008
{!searchQuery && recentMembers.length > 0 && !isLoadingMembers && (
@@ -1084,8 +1081,6 @@ const AddMembersModal = ({
10841081
<div className="h-px bg-gradient-to-r from-transparent via-white/20 to-transparent my-3"></div>
10851082
</div>
10861083
)}
1087-
1088-
>>>>>>> origin/dev
10891084
{isLoadingMembers ? (
10901085
<div className="text-center py-8 text-gray-400">
10911086
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-customBlue-500 mx-auto mb-3"></div>

0 commit comments

Comments
 (0)