From 854b8a008a629937245b1d889792d85a6a29c1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:14:18 +0100
Subject: [PATCH] Update list of reviewers (#1195)

(cherry picked from commit 345e70f9a8d8cbc0ba46af8437ff6feb9627be6d)

# Conflicts:
#	.github/reviewer-lottery.yml
---
 .github/reviewer-lottery.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/reviewer-lottery.yml b/.github/reviewer-lottery.yml
index 50c707e12b..69f4dae820 100644
--- a/.github/reviewer-lottery.yml
+++ b/.github/reviewer-lottery.yml
@@ -13,9 +13,9 @@ groups:
   - name: reviewers
     reviewers: 5
     usernames:
-      - rosterloh
-      - progtologist
+      - aprotyas
       - arne48
+<<<<<<< HEAD
       - DasRoteSkelett
       - Serafadam
       - harderthan
@@ -33,4 +33,21 @@ groups:
       - duringhof
       - bijoua29
       - lm2292
+=======
+      - bijoua29
+      - christophfroehlich
+      - DasRoteSkelett
+      - duringhof
+      - erickisos
+      - fmauch
+      - jaron-l
+      - livanov93
+>>>>>>> 345e70f (Update list of reviewers (#1195))
       - mcbed
+      - moriarty
+      - olivier-stasse
+      - peterdavidfagan
+      - progtologist
+      - saikishor
+      - VanshGehlot
+      - VX792