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 /dev-libs/libvterm/metadata.xml | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'dev-libs/libvterm/metadata.xml')
| -rw-r--r-- | dev-libs/libvterm/metadata.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml index e6fc33367084..119029816579 100644 --- a/dev-libs/libvterm/metadata.xml +++ b/dev-libs/libvterm/metadata.xml @@ -6,13 +6,10 @@ <name>Bernardo Meurer</name> </maintainer> <maintainer type="project"> -<<<<<<< HEAD -======= <email>proxy-maint@gentoo.org</email> <name>Gentoo Proxy Maintainers Project</name> </maintainer> <maintainer type="project"> ->>>>>>> next <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> |