Fixed additional merge issues

This commit is contained in:
Arnfried Griesert
2023-06-12 06:08:33 +02:00
parent 51e98cfe61
commit 4fc5e366e3
7 changed files with 42 additions and 19 deletions
@@ -755,7 +755,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
{
[sectionLabs addRowWithTag:LABS_ENABLE_LIVE_LOCATION_SHARING];
}
*/
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_SESSION_MANAGER];
/* bwi: disabled for our apps
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_CLIENT_INFO_FEATURE];