From 501c97aeea27138aa7952b5812c76b3bfb75195e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 2 Oct 2020 04:36:24 +0300
Subject: [PATCH] CONDUCT.md: update maintainers (#1625)

---
 CONDUCT.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONDUCT.md b/CONDUCT.md
index aebb7899..59437f0b 100644
--- a/CONDUCT.md
+++ b/CONDUCT.md
@@ -67,9 +67,9 @@ members of the project's leadership.
 
 ## Project Maintainers
 
-* Sam Stephenson <<sstephenson@gmail.com>>
-* Mislav Marohnić <<mislav.marohnic@gmail.com>>
-* Erik Michaels-Ober <<sferik@gmail.com>>
+* Yamashita, Yuu <<peek824545201@gmail.com>>
+* Daniel Hahler <<git@thequod.de>>
+* Josh Friend <<josh@fueledbycaffeine.com>>
 
 ## Attribution