From 780fbffc686ce52d3666578335c47e8a21e725af Mon Sep 17 00:00:00 2001 From: Lourens Schep Date: Tue, 10 May 2022 09:48:43 -0300 Subject: [PATCH] Fix merge conflict type issue --- .../client/two-column-tasks/completed-header-with-ces.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/woocommerce-admin/client/two-column-tasks/completed-header-with-ces.tsx b/plugins/woocommerce-admin/client/two-column-tasks/completed-header-with-ces.tsx index 1fe63daf63e..3b3939eee40 100644 --- a/plugins/woocommerce-admin/client/two-column-tasks/completed-header-with-ces.tsx +++ b/plugins/woocommerce-admin/client/two-column-tasks/completed-header-with-ces.tsx @@ -94,7 +94,7 @@ export const TaskListCompletedHeaderWithCES: React.FC< TaskListCompletedHeaderPr updateOptions( { [ SHOWN_FOR_ACTIONS_OPTION_NAME ]: [ CES_ACTION, - ...cesShownForActions, + ...( cesShownForActions || [] ), ], } ); setSubmittedScore( true );