summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/kde-frameworks/kio-5.62.0
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/kde-frameworks/kio-5.62.0')
-rw-r--r--metadata/md5-cache/kde-frameworks/kio-5.62.04
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.62.0 b/metadata/md5-cache/kde-frameworks/kio-5.62.0
index f54f49e89b6d..0ad23128189e 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.62.0
@@ -12,5 +12,9 @@ RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-fra
RESTRICT=test
SLOT=5/5.62
SRC_URI=mirror://kde/stable/frameworks/5.62/kio-5.62.0.tar.xz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=c8ce8301fc09ace49dd243db52e2aefd