Resolve conflicts

This commit is contained in:
Hugo 2024-08-06 13:20:00 +00:00
parent d7f0c6cf0e
commit edb944c508

View file

@ -930,7 +930,7 @@
* ⭐ **[NewPipe](https://newpipe.net/)** - Ad-free YouTube * ⭐ **[NewPipe](https://newpipe.net/)** - Ad-free YouTube
* ⭐ **[Tubular](https://github.com/polymorphicshade/Tubular)** - Ad-free YouTube / SponsorBlock / ReturnYTDislikes * ⭐ **[Tubular](https://github.com/polymorphicshade/Tubular)** - Ad-free YouTube / SponsorBlock / ReturnYTDislikes
* ⭐ **[Seal](https://github.com/JunkFood02/Seal)**, [YouTubeDL Android](https://github.com/yausername/youtubedl-android), [ytdlnis](https://github.com/deniscerri/ytdlnis) or [SongTube](https://github.com/SongTube/SongTube-App) - Audio / Video Downloaders * ⭐ **[Seal](https://github.com/JunkFood02/Seal)**, [YouTubeDL Android](https://github.com/yausername/youtubedl-android), [ytdlnis](https://github.com/deniscerri/ytdlnis) or [SongTube](https://github.com/SongTube/SongTube-App) - Audio / Video Downloaders
* ⭐ **[GrayJay](https://grayjay.app/)** - YouTube, Twitch, Rumble etc / [GitLab](https://gitlab.futo.org/videostreaming/grayjay) / [Plugins](https://gitlab.futo.org/videostreaming/plugins) * ⭐ **[GrayJay](https://grayjay.app/)** - YouTube, Twitch, Rumble etc / [Gitlab](https://gitlab.futo.org/videostreaming/grayjay) / [Plugins](https://gitlab.futo.org/videostreaming/plugins)
* [Clipious](https://github.com/lamarios/clipious) - Android Invidious Client * [Clipious](https://github.com/lamarios/clipious) - Android Invidious Client
* [Hyperion](https://github.com/zt64/Hyperion) - YouTube Frontend * [Hyperion](https://github.com/zt64/Hyperion) - YouTube Frontend
* [SkyTube](https://github.com/SkyTubeTeam/SkyTube) - YouTube Player * [SkyTube](https://github.com/SkyTubeTeam/SkyTube) - YouTube Player