Skip to content

Commit 5ba04c3

Browse files
committed
fix(tasks): resolve conflict errors
1 parent f1e4ce5 commit 5ba04c3

File tree

1 file changed

+0
-14
lines changed
  • apps/web/src/app/[locale]/(dashboard)/[wsId]/tasks/boards/[boardId]

1 file changed

+0
-14
lines changed

apps/web/src/app/[locale]/(dashboard)/[wsId]/tasks/boards/[boardId]/task-list.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -790,24 +790,10 @@ export const BoardColumn = React.memo(function BoardColumn({
790790
<CommandItem
791791
key={member.id}
792792
onSelect={() => {
793-
<<<<<<< HEAD
794793
// Selecting a specific assignee clears 'all' and 'unassigned', and toggles the assignee
795794
const newAssignees = new Set(filters.assignees);
796795
newAssignees.delete('all');
797796
newAssignees.delete('unassigned');
798-
=======
799-
const newAssignees = new Set(
800-
filters.assignees
801-
);
802-
if (
803-
filters.assignees.has('all') ||
804-
filters.assignees.has('unassigned')
805-
) {
806-
// If 'all' or 'unassigned' is selected, clear them to avoid conflicts
807-
newAssignees.delete('all');
808-
newAssignees.delete('unassigned');
809-
}
810-
>>>>>>> origin/feat/tasks/add-tags
811797
if (isSelected) {
812798
newAssignees.delete(member.id);
813799
} else {

0 commit comments

Comments
 (0)