Metodos de Outlook

Author: n3rio

microsoftgraph/client.py

@@ -107,7 +107,6 @@ def set_token(self, token):
         """
         self.token = token
 
-<<<<<<< Updated upstream
     def get_me(self, params=None):
         """Retrieve the properties and relationships of user object.
 
@@ -168,14 +167,6 @@ def send_mail(self, subject=None, recipients=None, body='', content_type='HTML',
 
     def _get_headers(self):
         return {'Authorization': 'Bearer ' + self.token['access_token']}
-=======
-    def get_me(self):
-        """
-        Obtiene el "profile" del usuario
-        :return: dictionary of user profile.
-        """
-        return self._get('me')
->>>>>>> Stashed changes
 
     def get_me_events(self):
         """