diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /media-video/mpv/metadata.xml | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'media-video/mpv/metadata.xml')
| -rw-r--r-- | media-video/mpv/metadata.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 78824a7b5960..61ab5a1fe43a 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -1,15 +1,9 @@ <?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> |