Remove git data from file
It's unexpected how it leaked to file but it should not be here
Also reordering some lines for lowering cherry-pick errors
Closes-bug: PROD-36019
Change-Id: Idaaa3d5d28e74ebe74716242f6a1687ca94a6104
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index 77aaa83..c3a6f07 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -14,16 +14,13 @@
- 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.srogov
- system.openssh.server.team.members.vkuspits
- system.openssh.server.team.members.yisakov
- system.openssh.server.team.members.wnawrot
+- system.openssh.server.team.members.qwu
- system.openssh.server.team.members.srudyka
parameters:
_param: