This is an automated cherry-pick of pingcap#55760

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Aug 30, 2024 · 1ef521d · 1ef521d
1 parent 227028a
commit 1ef521d
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -121,3 +121,15 @@ aliases:
     - Benjamin2037
     - gmhdbjd
     - lichunzhu
+<<<<<<< HEAD
+=======
+  sig-approvers-planner: # approvers for planner module
+    - AilinKid
+    - Rustin170506
+    - elsa0520
+    - fixdb
+    - hawkingrei
+    - qw4990
+    - time-and-fate
+    - winoros
+>>>>>>> ad5a9fd96bc (owners: update after Rustin170506 changed GitHub ID (#55760))