diff options
Diffstat (limited to 'metadata/md5-cache/x11-themes/qtcurve-9999')
| -rw-r--r-- | metadata/md5-cache/x11-themes/qtcurve-9999 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999 index a54880d05005..72b1d797486e 100644 --- a/metadata/md5-cache/x11-themes/qtcurve-9999 +++ b/metadata/md5-cache/x11-themes/qtcurve-9999 @@ -11,5 +11,9 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 ) RESTRICT=test SLOT=0 +<<<<<<< HEAD _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 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 git-r3 562b380fc59ae6a8622171d0acb777d1 kde5 e9642fa5c53197b7ba3d9e2c8460d5c5 kde5-functions 8593b8fd9e43123f882a49d0079dc20e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a virtualx 53625127887b62eabb9ec61d3d943462 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=1558ad40dd7aaa8bd306ff2f7ec1db8c |