From 06f87d24a707720b5c8796b7f1ccf64de792c1bd Mon Sep 17 00:00:00 2001
From: ronaldheft <ron@ronaldheft.com>
Date: Mon, 22 Aug 2022 18:12:00 -0400
Subject: [PATCH] Fix merge conflict

---
 ios/App/Shared/player/PlayerProgress.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/App/Shared/player/PlayerProgress.swift b/ios/App/Shared/player/PlayerProgress.swift
index 6b86861f..017cf9e3 100644
--- a/ios/App/Shared/player/PlayerProgress.swift
+++ b/ios/App/Shared/player/PlayerProgress.swift
@@ -123,7 +123,7 @@ class PlayerProgress {
         }
     }
     
-    private static func updateLocalSessionFromServerMediaProgress() async {
+    private func updateLocalSessionFromServerMediaProgress() async {
         NSLog("updateLocalSessionFromServerMediaProgress: Checking if local media progress was updated on server")
         guard let session = try! await Realm().objects(PlaybackSession.self).last(where: { $0.isActiveSession == true })?.freeze() else {
             NSLog("updateLocalSessionFromServerMediaProgress: Failed to get session")