From 40e3ed2096237853613751b876bce48754577b1c Mon Sep 17 00:00:00 2001
From: luomingshuang <739314837@qq.com>
Date: Wed, 1 Jun 2022 22:01:05 +0800
Subject: [PATCH] solve the conflicts

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 1447627fb..af372f427 100644
--- a/README.md
+++ b/README.md
@@ -247,7 +247,6 @@ We provide one model for this recipe: [Pruned stateless RNN-T: Conformer encoder
 | modified beam search | 7.76  |  8.71    |  13.41       |
 
 We provide a Colab notebook to run a pre-trained Pruned Transducer Stateless model: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/drive/1EV4e1CHa1GZgEF-bZgizqI9RyFFehIiN?usp=sharing)
-<<<<<<< HEAD
 
 ### Alimeeting
 
@@ -262,8 +261,6 @@ We provide one model for this recipe: [Pruned stateless RNN-T: Conformer encoder
 | modified beam search | 30.38  |  34.25   |
 
 We provide a Colab notebook to run a pre-trained Pruned Transducer Stateless model: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/drive/1tKr3f0mL17uO_ljdHGKtR7HOmthYHwJG?usp=sharing)
-=======
->>>>>>> master
 
 ## Deployment with C++