From 1a5c819a2a224803fbd4a52022467888d14bd030 Mon Sep 17 00:00:00 2001
From: panxi <xinleiryan.pan@verizonwireless.com>
Date: Tue, 26 Nov 2019 13:55:29 -0500
Subject: [PATCH] fix conflict

---
 MVMCoreUI/Molecules/StandardHeaderView.swift | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/MVMCoreUI/Molecules/StandardHeaderView.swift b/MVMCoreUI/Molecules/StandardHeaderView.swift
index 746d510c..e6d00efa 100644
--- a/MVMCoreUI/Molecules/StandardHeaderView.swift
+++ b/MVMCoreUI/Molecules/StandardHeaderView.swift
@@ -8,11 +8,7 @@
 
 import UIKit
 
-<<<<<<< HEAD
-public class StandardHeaderView: ViewConstrainingView {
-=======
 public class StandardHeaderView: ViewConstrainingView, ModelMoleculeViewProtocol {
->>>>>>> feature/models
     var line: Line?
     
     // MARK: - MVMCoreViewProtocol