Merge pull request #165 from Smibu/patch-1

Fix parameter type annotations in merge_settings

Author: pitbulk

src/onelogin/saml2/idp_metadata_parser.py

@@ -219,9 +219,9 @@ def merge_settings(settings, new_metadata_settings):
         """
         Will update the settings with the provided new settings data extracted from the IdP metadata
         :param settings: Current settings dict data
-        :type settings: string
+        :type settings: dict
         :param new_metadata_settings: Settings to be merged (extracted from IdP metadata after parsing)
-        :type new_metadata_settings: string
+        :type new_metadata_settings: dict
         :returns: merged settings
         :rtype: dict
         """