From 269898f56620f0d228ef7ce69f9db7b72ea52640 Mon Sep 17 00:00:00 2001
From: panxi <xinleiryan.pan@verizonwireless.com>
Date: Tue, 26 Nov 2019 13:57:24 -0500
Subject: [PATCH] fix conflicts

---
 MVMCoreUI/Atoms/Views/CaretView.swift | 24 +++++++++++++-----------
 MVMCoreUI/Atoms/Views/DashLine.swift  |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/MVMCoreUI/Atoms/Views/CaretView.swift b/MVMCoreUI/Atoms/Views/CaretView.swift
index 08251fcb..2c4669fe 100644
--- a/MVMCoreUI/Atoms/Views/CaretView.swift
+++ b/MVMCoreUI/Atoms/Views/CaretView.swift
@@ -124,18 +124,8 @@ open class CaretView: View {
             lineWidth = lineWidthValue
         }
     }
-}
-
-extension CaretView: MVMCoreUIViewConstrainingProtocol {
-    open func needsToBeConstrained() -> Bool {
-        return true
-    }
     
-    open func alignment() -> UIStackView.Alignment {
-        return UIStackView.Alignment.leading;
-    }
-    
-    public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
+    override public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
         guard let caretModel = model as? CaretViewModel else {
             return
         }
@@ -156,3 +146,15 @@ extension CaretView: MVMCoreUIViewConstrainingProtocol {
         }
     }
 }
+
+extension CaretView: MVMCoreUIViewConstrainingProtocol {
+    open func needsToBeConstrained() -> Bool {
+        return true
+    }
+    
+    open func alignment() -> UIStackView.Alignment {
+        return UIStackView.Alignment.leading;
+    }
+    
+    
+}
diff --git a/MVMCoreUI/Atoms/Views/DashLine.swift b/MVMCoreUI/Atoms/Views/DashLine.swift
index 662027fa..937b7313 100644
--- a/MVMCoreUI/Atoms/Views/DashLine.swift
+++ b/MVMCoreUI/Atoms/Views/DashLine.swift
@@ -84,7 +84,7 @@ open class DashLine: View {
         }
     }
     
-    public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
+    public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
         guard let dashLineModel = model as? DashLineModel else {
             return
         }