summaryrefslogtreecommitdiff
path: root/www-plugins/pdfjs/metadata.xml
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /www-plugins/pdfjs/metadata.xml
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'www-plugins/pdfjs/metadata.xml')
-rw-r--r--www-plugins/pdfjs/metadata.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/www-plugins/pdfjs/metadata.xml b/www-plugins/pdfjs/metadata.xml
index 435535a613a5..5f7f4b246990 100644
--- a/www-plugins/pdfjs/metadata.xml
+++ b/www-plugins/pdfjs/metadata.xml
@@ -1,7 +1,14 @@
<?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>