rename readme and fixed conflict

3 years ago · 357b177232
parent 30d43045fb
commit 357b177232
2 changed files with 0 additions and 4 deletions
--- a/demos/speech_web/README_cn.md
+++ b/demos/speech_web/README_cn.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')