summaryrefslogtreecommitdiff
path: root/dev-texlive/texlive-pictures/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'dev-texlive/texlive-pictures/Manifest')
-rw-r--r--dev-texlive/texlive-pictures/Manifest4
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 13397ecb6dca..3fdca51a2e89 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -800,5 +800,9 @@ DIST texlive-module-xypic-2019.tar.xz 709808 BLAKE2B 7192d7d06eb8fec456213d81244
DIST texlive-module-xypic.doc-2017.tar.xz 3923164 BLAKE2B 05428b38455175d31fb3f6cd492a7209ad90370c15467637894e387836d7c25d669263c16382b24d1ed060b3e7d50282a06197cc79e5fd5731b9c92f1097baed SHA512 9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc
DIST texlive-module-xypic.doc-2019.tar.xz 3923196 BLAKE2B 3a1598c0f34833f8336a9301102b259b8ccf293b1866126d67c812e933c3eddb4489dd733aa47e0b8b4a79fe0965a06a981c0d4420dfd8beac148edc581ac89e SHA512 cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff
EBUILD texlive-pictures-2017.ebuild 5535 BLAKE2B 7574f015be350afe1aab6d08a0d5e67418de4ad401e461f75c088313b28a01ec45a94bf6ff1dbe8ca8e82429f8f0e72d435e411bf1f0651682f1934cb1136f26 SHA512 5b4ef2b910433f9afbf7e77112d2cea8eccb896ea9e10ab37442a55da1736277eaa7fdd8b529fb62fc20a3824a4ad96da766f749739eedf0be8c18caf07846d5
+<<<<<<< HEAD
EBUILD texlive-pictures-2019.ebuild 6570 BLAKE2B eb17d4c15a2f36c6f3445229fc72a787210d3a29f365d5573ee097fe55241cb78e66c7fa48cb8b01c14f6a9371cb14e4cfeea0e825a15e0177d3b457e0d17d56 SHA512 01cb7028a5eddbf9e759cdd1d7dc1999caf52c96ad1a0e4ab2a21eabfd0e287f134437c7b1c8740de41451f9c272b5d6cee5195f8ba2b81e1fb39fb39b9e5e2f
+=======
+EBUILD texlive-pictures-2019.ebuild 6566 BLAKE2B 042d72a60186de83270eec5e85b6b9eaa49cf2d72292579bc1be64ae13694017e926104d5d47a44f3516d6a38e12649a6903fd64cdafd1e01de41dcc5cea40dd SHA512 e7126c0c58a960a275932986f765715d9af4d1a03a7fe59c591496ded1de2842bd709268eae18b0309586867053b0cdc934329b40cd3a05327b9c0714fb990e1
+>>>>>>> next
MISC metadata.xml 478 BLAKE2B e113025fb506c77cc1f2a8099b1182d3ce057e8067145dfe921af4289f22f3894e4a20eb6f941f4bdcad739df93975766490d62ce253a0710ff428dcc045ec11 SHA512 547880e196d638109a84a159cf694f201dc6e01ae15d26e252fc7da697cc2c466da0a3403c149d5847049da06e682557293cda020b77a05b0684611b4562f957