From c951828168c458d3685f1b22f501fbeb4888f0a0 Mon Sep 17 00:00:00 2001
From: LaneSh4d0w <30985701+LaneSh4d0w@users.noreply.github.com>
Date: Wed, 13 Jan 2021 21:40:55 +0100
Subject: [PATCH] Fix #2

---
 README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/README.md b/README.md
index 7db70883f3..6152a2a427 100644
--- a/README.md
+++ b/README.md
@@ -41,17 +41,8 @@ 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>
 		<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>
 		<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>