summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/app-text/openjade-1.3.2-r9
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/app-text/openjade-1.3.2-r9')
-rw-r--r--metadata/md5-cache/app-text/openjade-1.3.2-r94
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r9 b/metadata/md5-cache/app-text/openjade-1.3.2-r9
index cafc8bb24310..9f5a84a490f0 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r9
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r9
@@ -9,5 +9,9 @@ LICENSE=MIT
RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 >=app-text/sgml-common-0.6.3-r7
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/openjade/openjade/1.3.2/openjade-1.3.2.tar.gz
+<<<<<<< HEAD
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e sgml-catalog-r1 d8b0f83f3e731fd3f34507d50d8bc7e2 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e sgml-catalog-r1 d8b0f83f3e731fd3f34507d50d8bc7e2 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=6b406cc83aa6f41dd1ef5324d180f97f