rebase

Signed-off-by: drfaust92 <[email protected]>
grafana · Aug 25, 2024 · c9455f8 · c9455f8
1 parent 9d59e38
commit c9455f8
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
@@ -1,10 +1,6 @@
 # tempo-distributed
 
-<<<<<<< HEAD
-![Version: 1.16.1](https://img.shields.io/badge/Version-1.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
-=======
-![Version: 1.16.0](https://img.shields.io/badge/Version-1.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
->>>>>>> b4d4eabf (rebase)
+![Version: 1.17.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode