mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
panxi 2019-11-26 13:55:29 -05:00
parent 437138007f
commit 1a5c819a2a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Molecules/StandardHeaderView.swift
View File

@ -8,11 +8,7 @@
import UIKit import UIKit
<<<<<<< HEAD
public class StandardHeaderView: ViewConstrainingView {
=======
public class StandardHeaderView: ViewConstrainingView, ModelMoleculeViewProtocol { public class StandardHeaderView: ViewConstrainingView, ModelMoleculeViewProtocol {
>>>>>>> feature/models
var line: Line? var line: Line?
// MARK: - MVMCoreViewProtocol // MARK: - MVMCoreViewProtocol