Merge pull request #1544 from scala/bishabosha-patch-2

bishabosha · web-flow · commit 35b77016238c · 2023-08-30T12:22:16.000+02:00
Update conduct.md
diff --git a/conduct.md b/conduct.md
@@ -95,7 +95,6 @@ listed above,
   choose who you are talking to:
   * Seth Tisue, Lightbend ([seth.tisue@lightbend.com](mailto:seth.tisue@lightbend.com))
   * Lukas Rytz, Lightbend ([lukas.rytz@lightbend.com](mailto:lukas.rytz@lightbend.com))
-  * Darja Jovanovic, Scala Center ([darja.jovanovic@epfl.ch](mailto:darja.jovanovic@epfl.ch))
   * Sébastien Doeraene, Scala Center ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch))
 
 ### Examples of unacceptable behavior

-Original file line number
+Diff line change
   choose who you are talking to:
   * Seth Tisue, Lightbend ([[email protected]](mailto:[email protected]))
   * Lukas Rytz, Lightbend ([[email protected]](mailto:[email protected]))
 -  * Darja Jovanovic, Scala Center ([[email protected]](mailto:[email protected]))
   * Sébastien Doeraene, Scala Center ([[email protected]](mailto:[email protected]))
 ### Examples of unacceptable behavior