commit ddc6396c3faf2a1e207eb05ea1a41c9983779f6f
author Dzmitry Stremkouski <dstremkouski@mirantis.com> Thu Apr 30 18:46:55 2020 +0200
committer Pavel Vaylov <pvaylov@mirantis.com> Mon Dec 14 17:46:17 2020 +0000
tree 5852a5d007409267d99526cb1990123354a103ff
parent cc12a4423d4964a59f529796def7d11f85f9d89a

Adding Pavel Vaylov

Prod-Related: PROD-35251
Change-Id: I30f220e901f0542f6a7c2980517d3d295dbf4b02

openssh/server/team/services.yml

diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 3a2a2d3..ba29eb9 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -14,7 +14,11 @@
 - system.openssh.server.team.members.osavatieiev
 - system.openssh.server.team.members.pbasov
 - system.openssh.server.team.members.pruzicka
+<<<<<<< HEAD   (cc12a4 Pass in Alerta authentication details for Alertmanager to se)
 - system.openssh.server.team.members.qwu
+=======
+- system.openssh.server.team.members.pvaylov
+>>>>>>> CHANGE (5ede29 Adding Pavel Vaylov)
 - system.openssh.server.team.members.sburns
 - system.openssh.server.team.members.vkuspits
 - system.openssh.server.team.members.yisakov