mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2026-10-09 09:11:49 +00:00
resolve conflicts from rebase
This commit is contained in:
committed by
Aayush Gupta
parent
3e2a58c839
commit
5a1dd5be4a
@@ -50,4 +50,4 @@ class JVMAppearanceActions : AppearanceActions {
|
||||
else -> DesktopOs.UNKNOWN
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user