fixed pep8 issues and corrected deprecated version

Author: tinuademargaret

astroquery/gemini/core.py

@@ -22,12 +22,6 @@
 from ..exceptions import AuthenticationWarning
 
 
-<<<<<<< HEAD
-=======
-logger = logging.getLogger(__name__)
-
-
->>>>>>> changes requested
 __all__ = ['GeminiObservations', 'GeminiObservationsClass']  # specifies what to import
 
 
@@ -534,7 +528,7 @@ def _gemini_json_to_table(json):
         "dec"]
 
 
-@deprecated(since='v0.4.2', alternative='GeminiObservationsClass')
+@deprecated(since='v0.4.3', alternative='GeminiObservationsClass')
 class ObservationsClass(GeminiObservationsClass):
     pass
 

astroquery/mast/observations.py

@@ -851,7 +851,7 @@ def service_request_async(self, service, params, pagesize=None, page=None, **kwa
         return self._portal_api_connection.service_request_async(service, params, pagesize, page, **kwargs)
 
 
-@deprecated(since='v0.4.2', alternative='MastObservationsClass')
+@deprecated(since='v0.4.3', alternative='MastObservationsClass')
 class ObservationsClass(MastObservationsClass):
     pass