github/iptv
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Upstream info

Browse Source
This commit is contained in:
Shadix Aced
2021-01-13 21:19:01 +01:00
parent b375161abf 2b96247b1f
commit f1c3e9856b
14 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@@ -41,11 +41,15 @@ Or select one of the playlists from the list below.
<tr><td align="left">Lifestyle</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/lifestyle.m3u</code></td></tr>
<tr><td align="left">Local</td><td align="right">205</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr>
<tr><td align="left">Movies</td><td align="right">43</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/movies.m3u</code></td></tr>
<<<<<<< HEAD
<<<<<<< HEAD
<tr><td align="left">Music</td><td align="right">133</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
<tr><td align="left">News</td><td align="right">211</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
=======
<tr><td align="left">Music</td><td align="right">145</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
=======
<tr><td align="left">Music</td><td align="right">146</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/music.m3u</code></td></tr>
>>>>>>> 7083f628c0b468e4f523b50280b9872b31074f49
<tr><td align="left">News</td><td align="right">213</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
>>>>>>> 947179c461f4b69252a7ead47e359355ddfd3f5e
<tr><td align="left">Religious</td><td align="right">185</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/religious.m3u</code></td></tr>
@@ -146,7 +150,11 @@ Or select one of the playlists from the list below.
<tr><td align="left">Vietnamese</td><td align="right">31</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/vie.m3u</code></td></tr>
<tr><td align="left">Western Frisian</td><td align="right">1</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/fry.m3u</code></td></tr>
<tr><td align="left">Yue Chinese</td><td align="right">14</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/yue.m3u</code></td></tr>
<<<<<<< HEAD
<tr><td align="left">Undefined</td><td align="right">304</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
=======
<tr><td align="left">Undefined</td><td align="right">340</td><td align="left"><code>https://iptv-org.github.io/iptv/languages/undefined.m3u</code></td></tr>
>>>>>>> 7083f628c0b468e4f523b50280b9872b31074f49
</tbody>
</table>
@@ -415,7 +423,7 @@ Or select one of the playlists from the list below.
<tr><td align="left">🇹🇼&nbsp;Taiwan
</td><td align="right">60</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tw.m3u</code></td><td align="left"></td></tr>
<tr><td align="left">🇹🇯&nbsp;Tajikistan
</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tj.m3u</code></td><td align="left"></td></tr>
</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tj.m3u</code></td><td align="left"></td></tr>
<tr><td align="left">🇹🇿&nbsp;Tanzania
</td><td align="right">2</td><td align="left" nowrap><code>https://iptv-org.github.io/iptv/countries/tz.m3u</code></td><td align="left"></td></tr>
<tr><td align="left">🇹🇭&nbsp;Thailand