From 5a1dd5be4a98fc591a04995128c34490ac94483e Mon Sep 17 00:00:00 2001
From: Ida Delphine <idadelm@gmail.com>
Date: Wed, 7 Oct 2026 01:20:30 -0700
Subject: [PATCH] resolve conflicts from rebase

---
 .../kotlin/net/newpipe/app/platform/JVMAppearanceActions.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/src/jvmMain/kotlin/net/newpipe/app/platform/JVMAppearanceActions.kt b/shared/src/jvmMain/kotlin/net/newpipe/app/platform/JVMAppearanceActions.kt
index 51b357452..376f6a134 100644
--- a/shared/src/jvmMain/kotlin/net/newpipe/app/platform/JVMAppearanceActions.kt
+++ b/shared/src/jvmMain/kotlin/net/newpipe/app/platform/JVMAppearanceActions.kt
@@ -50,4 +50,4 @@ class JVMAppearanceActions : AppearanceActions {
             else -> DesktopOs.UNKNOWN
         }
     }
-}
\ No newline at end of file
+}