From ea6089e772a5415b65efe9204a1a9ef4edd70dd9 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 12 Feb 2020 14:40:40 -0500 Subject: [PATCH] conflict resoltuion --- MVMCore/MVMCore/Models/ModelMapping.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MVMCore/MVMCore/Models/ModelMapping.swift b/MVMCore/MVMCore/Models/ModelMapping.swift index 0183069..9464576 100644 --- a/MVMCore/MVMCore/Models/ModelMapping.swift +++ b/MVMCore/MVMCore/Models/ModelMapping.swift @@ -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) } }