merged

sunpy · Dec 3, 2024 · 0e2294c · 0e2294c
2 parents 3d51452 + 060b35c
commit 0e2294c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/about/project.rst b/about/project.rst
@@ -198,7 +198,10 @@ Community Roles
 The following people hold named roles in the SunPy community.
 See :ref:`role_descriptions` for more details on each role.
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 060b35cb134ecc3b3bc489d54ab3c5cd4cde4d31
 .. custom-card:: Laura Hayes
     :github: hayesla
     :title: Communication and Education Lead