Fixed conflict

gafusion · Sep 11, 2024 · 0af225b · 0af225b
1 parent bc13e11
commit 0af225b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/docs/_sources/cgyro.rst.txt b/docs/_sources/cgyro.rst.txt
@@ -6,9 +6,10 @@ Brief description
 
 CGYRO is a global-spectral gyrokinetic code. Core developers are
 
-* Emily Belli, `General Atomics <https://www.ga.com/>`_ (collisions, rotation)
-* Jeff Candy, `General Atomics <https://www.ga.com/>`_ (global-spectral method)
-* Igor Sfiligoi, `SDSC <https://www.sdsc.edu/>`_ (performance)
+* Emily Belli, `General Atomics <https://www.ga.com/>`_ 
+* Jeff Candy, `General Atomics <https://www.ga.com/>`_
+* Klaus Hallatschek, `IPP <https://www.ipp.mpg.de/>`_ 
+* Igor Sfiligoi, `SDSC <https://www.sdsc.edu/>`_ 
 
 Simulation images
 -----------------