summaryrefslogtreecommitdiff
path: root/www-plugins/pdfjs/metadata.xml
diff options
context:
space:
mode:
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>