From 0af225be55e0705a7d5179aee2b6fcd8121a548e Mon Sep 17 00:00:00 2001
From: Jeff Candy <candy@jaamweb.com>
Date: Tue, 10 Sep 2024 21:13:54 -0700
Subject: [PATCH] Fixed conflict

---
 docs/_sources/cgyro.rst.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/_sources/cgyro.rst.txt b/docs/_sources/cgyro.rst.txt
index 63addec..1842a6d 100644
--- 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
 -----------------