From 357b177232eac9cbac939e18394ec9b531f53689 Mon Sep 17 00:00:00 2001
From: iftaken <hww_ym@aliyun.com>
Date: Thu, 16 Jun 2022 15:34:26 +0800
Subject: [PATCH] rename readme and fixed conflict

---
 demos/speech_web/{README.MD => README_cn.md}   | 0
 paddlespeech/server/bin/paddlespeech_server.py | 4 ----
 2 files changed, 4 deletions(-)
 rename demos/speech_web/{README.MD => README_cn.md} (100%)

diff --git a/demos/speech_web/README.MD b/demos/speech_web/README_cn.md
similarity index 100%
rename from demos/speech_web/README.MD
rename to demos/speech_web/README_cn.md
diff --git a/paddlespeech/server/bin/paddlespeech_server.py b/paddlespeech/server/bin/paddlespeech_server.py
index 57d728872..175e8ffb6 100644
--- 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')