From c7929c509b9e68d8b693eb706d7e409a1b8c5e89 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 25 Mar 2020 13:25:23 -0400
Subject: [PATCH] review fixes

---
 .../Atomic/Protocols/TemplateProtocol.swift   |  1 -
 .../ModalMoleculeListTemplate.swift.orig      | 30 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig

diff --git a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
index 347458b0..56b1a86c 100644
--- a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
@@ -20,7 +20,6 @@ public extension TemplateProtocol where Self: ViewController {
         let data = try JSONSerialization.data(withJSONObject: pageJSON)
         let decoder = JSONDecoder()
         let templateModel = try decoder.decode(TemplateModel.self, from: data)
-        print(templateModel.toJSONString() ?? "")
         self.templateModel = templateModel
         self.pageModel = templateModel as? MVMControllerModelProtocol
     }
diff --git a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig b/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig
deleted file mode 100644
index af43d0af..00000000
--- a/MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift.orig
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  ModalMoleculeListTemplate.swift
-//  MVMCoreUI
-//
-//  Created by Ryan on 3/6/20.
-//  Copyright © 2020 Verizon Wireless. All rights reserved.
-//
-
-import UIKit
-
-open class ModalMoleculeListTemplate: MoleculeListTemplate {
-    
-<<<<<<< HEAD
-    override open func handleNewData() {
-        MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
-            if let _ = self {
-                MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
-            }
-=======
-    public var closeButton: MFCustomButton?
-        
-    override open func newDataBuildScreen() {
-        super.newDataBuildScreen()
-        closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
-            self?.dismiss()
->>>>>>> develop
-        }, verticalCentered: false)
-        super.handleNewData()
-    }
-}