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

Fix conflicts

Browse Source
This commit is contained in:
Shadix Aced
2021-01-15 21:14:29 +01:00
parent ae2da083b3 e6535ea843
commit 1707a2c7ad
23 changed files with 371 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.readme/_categories.md
View File

@@ -11,22 +11,38 @@
<tr><td align="left">Entertainment</td><td align="right">61</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/entertainment.m3u</code></td></tr>
<tr><td align="left">Family</td><td align="right">6</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/family.m3u</code></td></tr>
<tr><td align="left">Fashion</td><td align="right">17</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/fashion.m3u</code></td></tr>
<<<<<<< HEAD
<tr><td align="left">General</td><td align="right">88</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr>
=======
<tr><td align="left">General</td><td align="right">87</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/general.m3u</code></td></tr>
>>>>>>> 858878c95251fd99c78792c40fcf604b2802bfec
<tr><td align="left">History</td><td align="right">3</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/history.m3u</code></td></tr>
<tr><td align="left">Hobby</td><td align="right">8</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/hobby.m3u</code></td></tr>
<tr><td align="left">Kids</td><td align="right">44</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/kids.m3u</code></td></tr>
<tr><td align="left">Legislative</td><td align="right">21</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/legislative.m3u</code></td></tr>
<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>
<<<<<<< HEAD
<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">Local</td><td align="right">208</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/local.m3u</code></td></tr>
>>>>>>> 858878c95251fd99c78792c40fcf604b2802bfec
<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>
<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>
<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>
<tr><td align="left">Music</td><td align="right">137</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">212</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/news.m3u</code></td></tr>
<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>
<tr><td align="left">Shop</td><td align="right">20</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/shop.m3u</code></td></tr>
<<<<<<< HEAD
<tr><td align="left">Sport</td><td align="right">92</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sport.m3u</code></td></tr>
<tr><td align="left">Travel</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr>
<tr><td align="left">Weather</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr>
<tr><td align="left">XXX</td><td align="right">44</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr>
<tr><td align="left">Other</td><td align="right">3040</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr>
=======
<tr><td align="left">Sport</td><td align="right">90</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/sport.m3u</code></td></tr>
<tr><td align="left">Travel</td><td align="right">7</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/travel.m3u</code></td></tr>
<tr><td align="left">Weather</td><td align="right">4</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/weather.m3u</code></td></tr>
<tr><td align="left">XXX</td><td align="right">66</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/xxx.m3u</code></td></tr>
<tr><td align="left">Other</td><td align="right">3112</td><td align="left"><code>https://iptv-org.github.io/iptv/categories/other.m3u</code></td></tr>
>>>>>>> 858878c95251fd99c78792c40fcf604b2802bfec
</tbody>
</table>