From 1f8d2f53827847e1f7308c0a4b6bc47bee9eb14e Mon Sep 17 00:00:00 2001
From: Marco Santonastaso <marco@santonastaso.com>
Date: Tue, 12 Nov 2024 15:13:58 +0000
Subject: [PATCH] maintainers: add marnas and conduktorbot

---
 maintainers/maintainer-list.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f98a78a14a3f..f0d6b84688449 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4427,6 +4427,12 @@
     githubId = 6487079;
     name = "Dane Rieber";
   };
+  conduktorbot = {
+    email = "automation@conduktor.io";
+    github = "conduktorbot";
+    githubId = 96434751;
+    name = "Conduktor Bot";
+  };
   confus = {
     email = "con-f-use@gmx.net";
     github = "con-f-use";
@@ -13546,6 +13552,12 @@
     githubId = 1709273;
     name = "Robin Hack";
   };
+  marnas = {
+    email = "marco@santonastaso.com";
+    name = "Marco Santonastaso";
+    github = "marnas";
+    githubId = 39352252;
+  };
   marnym = {
     email = "markus@nyman.dev";
     github = "marnym";