diff options
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> |