diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /media-video/mpv/metadata.xml | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'media-video/mpv/metadata.xml')
| -rw-r--r-- | media-video/mpv/metadata.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index e34fb5f41655..78824a7b5960 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> +<<<<<<< HEAD <maintainer type="project"> <email>media-video@gentoo.org</email> <name>Gentoo Video project</name> +======= + <maintainer type="person"> + <email>zlogene@gentoo.org</email> + <name>Mikle Kolyada</name> +>>>>>>> next </maintainer> <use> <flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag> |