rename readme and fixed conflict

357b1772 · iftaken · 30d43045 · 357b1772 · 357b1772
显示空白变更内容
内联并排

Showing with 0 addition and 4 deletion

demos/speech_web/README_cn.md demos/speech_web/README_cn.md +0 -0

paddlespeech/server/bin/paddlespeech_server.py paddlespeech/server/bin/paddlespeech_server.py +0 -4

未找到文件。
--- a/demos/speech_web/README.MD
+++ b/demos/speech_web/README.MD
--- a/paddlespeech/server/bin/paddlespeech_server.py
+++ b/paddlespeech/server/bin/paddlespeech_server.py
@@ -45,10 +45,6 @@ app.add_middleware(
    allow_credentials=True,
    allow_methods=["*"],
    allow_headers=["*"])
-<<<<<<< HEAD
-=======
-
->>>>>>> develop

 @cli_server_register(
    name='paddlespeech_server.start', description='Start the service')