summaryrefslogtreecommitdiff
path: root/www-plugins/pdfjs/metadata.xml
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /www-plugins/pdfjs/metadata.xml
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'www-plugins/pdfjs/metadata.xml')
-rw-r--r--www-plugins/pdfjs/metadata.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/www-plugins/pdfjs/metadata.xml b/www-plugins/pdfjs/metadata.xml
index 5f7f4b246990..e8a87e7193f0 100644
--- a/www-plugins/pdfjs/metadata.xml
+++ b/www-plugins/pdfjs/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<<<<<<< HEAD
- <!-- maintainer-needed -->
-=======
<maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
->>>>>>> next
<upstream>
<remote-id type="github">mozilla/pdf.js</remote-id>
</upstream>