From 3b1a419db42b181d0db872eeaf896cfc4462ac3d Mon Sep 17 00:00:00 2001
From: guilevi <guilevi2000@gmail.com>
Date: Wed, 7 Apr 2021 11:27:22 +0200
Subject: [PATCH] I'm a dumbass, actually fixed conflict

---
 tts/watson/index.js | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/tts/watson/index.js b/tts/watson/index.js
index 86657e7..37ee688 100644
--- a/tts/watson/index.js
+++ b/tts/watson/index.js
@@ -5,7 +5,6 @@ const querystring = require('querystring');
 module.exports = class extends BaseEngine {
 	constructor() {
 		super("IBM Watson TTS", "ogg");
-<<<<<<< HEAD
 		this.voices = {};
 		this.populateVoiceList();
 	}
@@ -17,13 +16,7 @@ module.exports = class extends BaseEngine {
 			headers: {
 				'Authorization': authorization
 			},
-=======
-		this.voices = {
-			'Michael': 'en-US_MichaelV3Voice',
-			'Allison': 'en-US_AllisonV3Voice',
-			'Kevin': 'en-US_KevinV3Voice',
->>>>>>> 12a9f8fc5374d912e595cea204998daa4d7220ba
-		};
+		}
 		const res = await fetch(url, opts);
 		const voices = await res.json();
 		voices.voices.forEach((i) => {
@@ -34,7 +27,6 @@ module.exports = class extends BaseEngine {
 	getDefaultVoice() {
 		return 'Michael';
 	}
-<<<<<<< HEAD
 	IBMAuthString() {
 		let buff = new Buffer('apikey:' + process.env.watsonAPIKey);
 		let b64auth = buff.toString('base64');
@@ -43,13 +35,6 @@ module.exports = class extends BaseEngine {
 	async getSpeech(text, voice = this.getSpeechVoice(), params = {}) {
 		const url = process.env.watsonURL + "/v1/synthesize?voice=" + this.getInternalVoiceName(voice);
 		const authorization = this.IBMAuthString();
-=======
-	async getSpeech(text, voice = this.getSpeechVoice(), params = {}) {
-		const url = process.env.watsonURL + "/v1/synthesize?voice=" + this.getInternalVoiceName(voice);
-		let buff = new Buffer('apikey:' + process.env.watsonAPIKey);
-		let b64auth = buff.toString('base64');
-		const authorization = 'Basic ' + b64auth;
->>>>>>> 12a9f8fc5374d912e595cea204998daa4d7220ba
 		const opts = {
 			method: "post",
 			headers: {