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 /dev-libs/libvterm/metadata.xml | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
Diffstat (limited to 'dev-libs/libvterm/metadata.xml')
| -rw-r--r-- | dev-libs/libvterm/metadata.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml index 4c7c4a0d8e04..e6fc33367084 100644 --- a/dev-libs/libvterm/metadata.xml +++ b/dev-libs/libvterm/metadata.xml @@ -6,6 +6,13 @@ <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> |