From ab874960a7869b6e0bedbbeddff3a367d2a6af90 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 4 Feb 2025 15:34:25 +0000 Subject: [PATCH] cocc: Correct/deduplicate company listings Signed-off-by: Stephen Augustus --- committee-code-of-conduct/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index fa4f4877c..e829993a9 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -14,11 +14,11 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc ## Members -* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Lightstep +* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Upbound * Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent * Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft -* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns +* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent ## Emeritus Members @@ -60,14 +60,14 @@ The members and their terms are as follows: ### Term ends on February 17, 2026 -- Jeremy Rickard (Microsoft) -- Ana Margarita Medina (Lightstep) +- Jeremy Rickard +- Ana Margarita Medina ### Term ends on February 17, 2025 -- Danielle Lancashire (VMware) -- Hilliary Lipsig (RedHat) -- Xander Grzywinski (Microsoft) +- Danielle Lancashire +- Hilliary Lipsig +- Xander Grzywinski Please see the [bootstrapping document](./bootstrapping-process.md) and [election process guidelines](election.md) for more information on how members are picked and their responsibilities.