summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/sys-apps/texinfo-6.7
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/sys-apps/texinfo-6.7')
-rw-r--r--metadata/md5-cache/sys-apps/texinfo-6.74
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.7 b/metadata/md5-cache/sys-apps/texinfo-6.7
index fcbaff88c1bf..6e91cd93ce22 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.7
+++ b/metadata/md5-cache/sys-apps/texinfo-6.7
@@ -9,5 +9,9 @@ LICENSE=GPL-3
RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/perl ) !standalone? ( dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode ) nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnu/texinfo/texinfo-6.7.tar.gz
+<<<<<<< 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_=b693bae035aa04de23e0931ced052bd9