From e3f201fea3a2827b91fdac541433433252d4e1b4 Mon Sep 17 00:00:00 2001 From: Azad99-9 Date: Mon, 18 Dec 2023 18:28:30 +0530 Subject: [PATCH] resolved conflicts --- .../pre_auth_view_models/select_organization_view_model.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/view_model/pre_auth_view_models/select_organization_view_model.dart b/lib/view_model/pre_auth_view_models/select_organization_view_model.dart index 170da8b86..c58a452ec 100644 --- a/lib/view_model/pre_auth_view_models/select_organization_view_model.dart +++ b/lib/view_model/pre_auth_view_models/select_organization_view_model.dart @@ -259,9 +259,9 @@ class SelectOrganizationViewModel extends BaseModel { return { 'organizationsConnection': (existingOrganizations!["organizationsConnection"] - as List>) + + as List) + (newOrganizations!['organizationsConnection'] - as List>), + as List), }; }, ),