Git merge conflict was not actually resolved

pull/1986/head
Cyteon 7 months ago committed by GitHub
parent bc0abb6136
commit 64f2322ba0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -43,13 +43,11 @@ class StreamlabsPolly:
f"Please set the config variable STREAMLABS_POLLY_VOICE to a valid voice. options are: {voices}"
)
voice = str(settings.config["settings"]["tts"]["streamlabs_polly_voice"]).capitalize()
headers = {"referer": "https://streamlabs.com"}
body = {"voice": voice, "text": text, "service": "polly"}
<<<<<<< HEAD
headers = {"Referer": "https://streamlabs.com/"}
=======
>>>>>>> elebumm-master
response = requests.post(self.url, headers=headers, data=body)
if not check_ratelimit(response):
self.run(text, filepath, random_voice)

Loading…
Cancel
Save