GAIAMNGT-1700 Resolve conflicts

Jorge Fernandez Hernandez · Jorge Fernandez Hernandez · commit 220b885ac3b1 · 2024-10-01T06:15:03.000+02:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -275,6 +275,8 @@ gaia
   epoch photometry service to return all data associated to a given source.
   [#2376]
 
+- New retrieval types for datalink (Gaia DR4 release). [#3110]
+
 - Default Gaia catalog updated to DR3. [#2596]
 
 heasarc
