resolve conflicts

Expensify · May 30, 2024 · 3f22789 · 3f22789
1 parent 851f4d8
commit 3f22789
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -81,12 +81,7 @@ import * as ReportActionsUtils from './ReportActionsUtils';
 import StringUtils from './StringUtils';
 import * as TransactionUtils from './TransactionUtils';
 import * as Url from './Url';
-<<<<<<< HEAD
-import type * as UserUtils from './UserUtils';
-=======
 import type {AvatarSource} from './UserUtils';
-import * as UserUtils from './UserUtils';
->>>>>>> 99b0563 (Merge pull request #42805 from Krishna2323/krishna2323/issue/42751)
 
 type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18;