From ce846a024d82110c7130db2bfbd877c874f3e764 Mon Sep 17 00:00:00 2001
From: Forthrin <forthrin@users.noreply.github.com>
Date: Wed, 10 Apr 2019 18:59:17 +0200
Subject: [PATCH] [nrk] Remove whitespace in XML subtitles causing problems for
 .srt files

---
 youtube_dl/utils.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index a225f40cf..71713f63a 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -2831,11 +2831,7 @@ def dfxp2srt(dfxp_data):
                     self._applied_styles.pop()
 
         def data(self, data):
-<<<<<<< HEAD
-            self._out += data.strip()
-=======
             self._out += data
->>>>>>> [streamango] add support for streamcherry.com (#20592)
 
         def close(self):
             return self._out.strip()