Merge branch 'charlesmchen/conversationSettingsAssert'

8 years ago · 791b0d78a8
parent c7d25a66ad 1e6fd385b5
commit 791b0d78a8
1 changed files with 4 additions and 4 deletions
--- a/Signal/src/ViewControllers/OWSTableViewController.m
+++ b/Signal/src/ViewControllers/OWSTableViewController.m
@ -183,7 +183,7 @@ NSString * const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
        return self;
    }

-    [self commonInit];
+    [self owsTableCommonInit];

    return self;
 }
@ -195,7 +195,7 @@ NSString * const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
        return self;
    }

-    [self commonInit];
+    [self owsTableCommonInit];

    return self;
 }
@ -207,12 +207,12 @@ NSString * const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
        return self;
    }

-    [self commonInit];
+    [self owsTableCommonInit];

    return self;
 }

- (void)commonInit
+- (void)owsTableCommonInit
 {
    _contents = [OWSTableContents new];
    self.tableViewStyle = UITableViewStyleGrouped;