From 23a8c2c1baba15bd295bc32492b73fe7556964c0 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 11 Feb 2021 17:51:09 -0500
Subject: [PATCH] conflict update

---
 MVMCoreUI/Atomic/Atoms/Views/VideoDataManager.swift     | 8 ++++----
 MVMCoreUI/BaseControllers/ScrollingViewController.swift | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MVMCoreUI/Atomic/Atoms/Views/VideoDataManager.swift b/MVMCoreUI/Atomic/Atoms/Views/VideoDataManager.swift
index 046ba3bb..a4ba9235 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/VideoDataManager.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/VideoDataManager.swift
@@ -12,7 +12,7 @@ import AVFoundation
 @objcMembers open class VideoDataManager: NSObject {
     
     /// The state of the video.
-    @objc public enum State: Int {
+    @objc public enum VideoState: Int {
         case none
         case loading
         case loaded
@@ -23,13 +23,13 @@ import AVFoundation
     public var player: AVPlayer?
     
     // Thread Safe video state handling.
-    private var _videoState = State.none
+    private var _videoState = VideoState.none
     private let videoStatueQueue = DispatchQueue(label: "com.vzw.mvmcoreui.videoDataManager.state", attributes: .concurrent)
 
     /// The state of the video. Use KVO to listen for state changes.
-    @objc public var videoState: State {
+    @objc public var videoState: VideoState {
         get {
-            var state = State.none
+            var state = VideoState.none
             videoStatueQueue.sync {
                 state = _videoState
             }
diff --git a/MVMCoreUI/BaseControllers/ScrollingViewController.swift b/MVMCoreUI/BaseControllers/ScrollingViewController.swift
index 9a9a42e3..19c9d001 100644
--- a/MVMCoreUI/BaseControllers/ScrollingViewController.swift
+++ b/MVMCoreUI/BaseControllers/ScrollingViewController.swift
@@ -73,7 +73,7 @@ open class ScrollingViewController: ViewController {
         scrollView.flashScrollIndicators()
     }
     
-    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+    open func scrollViewDidScroll(_ scrollView: UIScrollView) {
         executeBehaviors { (behavior: PageScrolledBehavior) in
             behavior.pageScrolled(scrollView: scrollView)
         }