From 00b24eeb6eb817fe90d113673cf79e7a6d88526b Mon Sep 17 00:00:00 2001
From: Edresson Casanova <edresson1@gmail.com>
Date: Mon, 6 Nov 2023 09:17:36 -0300
Subject: [PATCH] Bug fix on rebase

---
 tests/api_tests/test_synthesize_api.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/api_tests/test_synthesize_api.py b/tests/api_tests/test_synthesize_api.py
index a65e299b..e7b4f120 100644
--- a/tests/api_tests/test_synthesize_api.py
+++ b/tests/api_tests/test_synthesize_api.py
@@ -22,8 +22,4 @@ def test_synthesize():
     )
 
     # test pipe_out command
-<<<<<<< HEAD
     run_cli(f'tts --text "test." --pipe_out --out_path "{output_path}" | aplay')
-=======
-    run_cli('tts --text "test." --pipe_out ' f'--out_path "{output_path}" | aplay')
->>>>>>> Make style