Fixed merge conflicts

2026-04-22 01:22:46 +02:00 · 2023-03-20 07:33:28 +01:00
parent e5d97ed154
commit c61ddcf39a
8 changed files with 12 additions and 17 deletions
@@ -57,7 +57,6 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
 // Remove a matrix session.
 - (void)removeMatrixSession:(MXSession*)mxSession;

-// $$$ bwi: which can be deleted
 /**
 Display the default onboarding flow.
 */