Git merge conflict was not actually resolved

This commit is contained in:
Cyteon authored and GitHub committed 2024-04-27 11:14:53 +02:00
1 parent bc0abb6136
commit 64f2322ba0
1 file changed
+2 -4
+2 -4
View File
@@ -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)