From 96e32cc00368da5029ce73b47029999f16b1a644 Mon Sep 17 00:00:00 2001
From: rayzhou2017 <ray@yunify.com>
Date: Sun, 19 May 2019 11:10:52 +0800
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index e3856726f..bd6944773 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,8 @@ KubeSphere Advanced Edition 2.0.0 provides an easy-to-use console with the aweso
 
 
 - Workload management
-<<<<<<< HEAD
 - Service mesh (Istio-based)
-- DevOps Delivery
-=======
-- Service mesh
 - DevOps
->>>>>>> 55bb8da037ba2ae266c190d7e34cae2f8c34c191
 - Source to Image
 - Multi-tenant management
 - Multi-dimensional and Multi-tenant Monitoring, Logging, Alerting, Notification