From 716788079b0067824ba332a69e7e014cf160d8d1 Mon Sep 17 00:00:00 2001
From: LaneSh4d0w <30985701+LaneSh4d0w@users.noreply.github.com>
Date: Wed, 13 Jan 2021 21:37:13 +0100
Subject: [PATCH] Fix

---
 .readme/_languages.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.readme/_languages.md b/.readme/_languages.md
index 7c55405090..95ec2bbe1b 100644
--- a/.readme/_languages.md
+++ b/.readme/_languages.md
@@ -74,10 +74,6 @@
 		<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
+		<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>
 	</tbody>
-</table>
\ No newline at end of file
+</table>