diff options
Diffstat (limited to 'metadata/md5-cache/app-misc/mc-4.8.23-r1')
| -rw-r--r-- | metadata/md5-cache/app-misc/mc-4.8.23-r1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-misc/mc-4.8.23-r1 b/metadata/md5-cache/app-misc/mc-4.8.23-r1 index 9a93e03f74b9..df9906654e53 100644 --- a/metadata/md5-cache/app-misc/mc-4.8.23-r1 +++ b/metadata/md5-cache/app-misc/mc-4.8.23-r1 @@ -10,5 +10,9 @@ RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2 REQUIRED_USE=spell? ( edit ) SLOT=0 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz +<<<<<<< HEAD _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=d02532d62fe2899b716adfa8f2269268 |