Merge branch 'develop' into feature/kevin

This commit is contained in:
Christiano, Kevin 2019-03-25 13:15:36 -04:00
commit 45467c9e3f
2 changed files with 3 additions and 3 deletions

View File

@ -36,7 +36,7 @@ import UIKit
super.init(frame: .zero)
}
required public init?(coder aDecoder: NSCoder) {
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
}

View File

@ -26,8 +26,8 @@
return self;
}
- (instancetype)initWithCoder:(NSCoder *)aDecoder {
self = [super initWithCoder:aDecoder];
- (instancetype)initWithCoder:(NSCoder *)coder {
self = [super initWithCoder:coder];
if (self) {
[self setupView];
}