From fab7eb39b50326abd99482c941095e5ce70e6895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Mon, 8 May 2023 13:39:40 +0200
Subject: [PATCH] Fix incomplete merge

---
 mpv/scripts/modern.lua | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/mpv/scripts/modern.lua b/mpv/scripts/modern.lua
index 1f86e10..05eff40 100644
--- a/mpv/scripts/modern.lua
+++ b/mpv/scripts/modern.lua
@@ -1145,16 +1145,8 @@ function osc_init()
 
     if (mp.get_property('video') == 'no') then -- dummy/forced window
         user_opts.visibility = "always"
-<<<<<<< HEAD
         user_opts.last_visibility = "always"
         visibility_mode('always', true)
-=======
-<<<<<<< HEAD
-=======
-        user_opts.last_visibility = "always"
-        visibility_mode('always', true)
->>>>>>> a21cfe5 (Fix OSC when playing audio)
->>>>>>> master
         scale = user_opts.scaleforcedwindow
     elseif state.fullscreen then
         scale = user_opts.scalefullscreen
@@ -1636,19 +1628,9 @@ function pause_state(name, enabled)
             visibility_mode('always', true)
             show_osc()
         else
-<<<<<<< HEAD
             if (mp.get_property('video') ~= 'no') then
                 visibility_mode(state.lastvisibility, true)
             end
-=======
-<<<<<<< HEAD
-            visibility_mode(state.lastvisibility, true)
-=======
-            if (mp.get_property('video') ~= 'no') then
-                visibility_mode(state.lastvisibility, true)
-            end
->>>>>>> a21cfe5 (Fix OSC when playing audio)
->>>>>>> master
         end
     end
     request_tick()