From 8e08869b89bc490b443664224a01024268f93b7a Mon Sep 17 00:00:00 2001
From: XXXXRT666 <runtongzhong@gmail.com>
Date: Tue, 6 Aug 2024 20:08:02 +0800
Subject: [PATCH] merge

---
 webui.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/webui.py b/webui.py
index 118e642d..28ba8525 100644
--- a/webui.py
+++ b/webui.py
@@ -772,14 +772,11 @@ def check_for_exists(file_list=None,is_train=False,is_dataset_processing=False):
             else:
                 gr.Warning(i18n('以下文件或文件夹不存在:'))
 
-<<<<<<< HEAD
 cmd = '"%s" GPT_SoVITS/g2pw_download'%python_exec
 print(cmd)
 p = Popen(cmd, shell=True)
 p.wait()
 
-=======
->>>>>>> upstream/main
 with gr.Blocks(title="GPT-SoVITS WebUI") as app:
     gr.Markdown(
         value=
@@ -1015,4 +1012,4 @@ with gr.Blocks(title="GPT-SoVITS WebUI") as app:
         share=is_share,
         server_port=webui_port_main,
         quiet=True,
-    )
+    )
\ No newline at end of file