Resolve merge conflict

Expensify · Apr 20, 2023 · 05f9ace · 05f9ace
1 parent 1fa5b0e
commit 05f9ace
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
@@ -252,11 +252,7 @@ function getOptionData(reportID) {
     const hasMultipleParticipants = participantPersonalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
     const subtitle = ReportUtils.getChatRoomSubtitle(report, policies);
 
-<<<<<<< HEAD
-    const login = Str.removeSMSDomain(personalDetail.login);
-=======
     const login = Str.removeSMSDomain(lodashGet(personalDetail, 'login', ''));
->>>>>>> 96575d4384 (Merge pull request #17694 from Expensify/jasper-showArchivedRoomsNoParticipants)
     const formattedLogin = Str.isSMSLogin(login) ? LocalePhoneNumber.formatPhoneNumber(login) : login;
 
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.