EUCLIDMNGT-1430 resolve conflicts

Jorge Fernandez Hernandez · Jorge Fernandez Hernandez · commit 50cc5f17025e · 2026-02-04T11:27:33.000+01:00
diff --git a/astroquery/gaia/core.py b/astroquery/gaia/core.py
@@ -854,7 +854,7 @@ def load_user(self, user_id, *, verbose=False):
 
         Returns
         -------
-        An user
+        A user
         """
 
         return self.is_valid_user(user_id=user_id, verbose=verbose)

-Original file line number
+Diff line change
         Returns
         -------
 -        An user
 +        A user
         """
         return self.is_valid_user(user_id=user_id, verbose=verbose)