fix merge

This commit is contained in:
David Langley
2022-03-17 09:16:11 +00:00
parent 712a9bee13
commit 6ca00b84e7
17 changed files with 391 additions and 36 deletions
@@ -2478,6 +2478,7 @@ TableViewSectionsDelegate>
else if (row == LABS_ENABLE_AUTO_REPORT_DECRYPTION_ERRORS)
{
cell = [self buildAutoReportDecryptionErrorsCellForTableView:tableView atIndexPath:indexPath];
}
else if (row == LABS_USE_ONLY_LATEST_USER_AVATAR_AND_NAME_INDEX)
{
MXKTableViewCellWithLabelAndSwitch *labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];