conflict resoltuion

This commit is contained in:
Kevin G Christiano 2020-02-12 14:40:40 -05:00
parent 4fa67d8138
commit ea6089e772

View File

@ -10,13 +10,13 @@ import Foundation
@objcMembers public class ModelMapping: NSObject {
public static func registerObjects() {
ModelRegistry.register(ActionOpenPageModel.self)
ModelRegistry.register(ActionOpenUrlModel.self)
ModelRegistry.register(ActionOpenAppModel.self)
ModelRegistry.register(ActionCallModel.self)
ModelRegistry.register(ActionPopupModel.self)
ModelRegistry.register(ActionTopAlertModel.self)
ModelRegistry.register(ActionBackModel.self)
ModelRegistry.register(ActionOpenPanelModel.self)
try? ModelRegistry.register(ActionOpenPageModel.self)
try? ModelRegistry.register(ActionOpenUrlModel.self)
try? ModelRegistry.register(ActionOpenAppModel.self)
try? ModelRegistry.register(ActionCallModel.self)
try? ModelRegistry.register(ActionPopupModel.self)
try? ModelRegistry.register(ActionTopAlertModel.self)
try? ModelRegistry.register(ActionBackModel.self)
try? ModelRegistry.register(ActionOpenPanelModel.self)
}
}