summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3')
-rw-r--r--metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.34
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3
index b3a559ccee28..ed81215cbc86 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.3
@@ -9,5 +9,9 @@ LICENSE=GPL-2
RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml
SLOT=0
SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/3.8.3-Leia.tar.gz -> kodi-pvr-iptvsimple-3.8.3.tar.gz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kodi-addon c1cb915efef96441d8262731df243cea multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=ce40e60ea1903bf71b3f6e556f5c82bc