diff options
Diffstat (limited to 'dev-libs/libvterm/metadata.xml')
| -rw-r--r-- | dev-libs/libvterm/metadata.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml index 119029816579..e6fc33367084 100644 --- a/dev-libs/libvterm/metadata.xml +++ b/dev-libs/libvterm/metadata.xml @@ -6,10 +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> |