Update README.md

96e32cc0 · rayzhou2017 · GitHub · 9fc8586d · 96e32cc0
Unverified Commit 96e32cc0 authored 5 years ago by rayzhou2017 Committed by GitHub 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 5 deletions
+0 -5
--- 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