diff options
Diffstat (limited to 'metadata/md5-cache/app-misc/vcontrold-0.98.8')
| -rw-r--r-- | metadata/md5-cache/app-misc/vcontrold-0.98.8 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.8 b/metadata/md5-cache/app-misc/vcontrold-0.98.8 index c754dd368b6c..b24e1b0393d2 100644 --- a/metadata/md5-cache/app-misc/vcontrold-0.98.8 +++ b/metadata/md5-cache/app-misc/vcontrold-0.98.8 @@ -10,5 +10,9 @@ LICENSE=GPL-3+ RDEPEND=dev-libs/libxml2:2 SLOT=0 SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.8.tar.gz -> vcontrold-0.98.8.tar.gz +<<<<<<< HEAD _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=3b84bf816ae2172735f5d155c228db13 |