diff options
Diffstat (limited to 'www-plugins/pdfjs/metadata.xml')
| -rw-r--r-- | www-plugins/pdfjs/metadata.xml | 4 |
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> |