From 8e8d5a1308d9e4a902433d51b8001c7cb54334ce Mon Sep 17 00:00:00 2001 From: drfaust92 Date: Thu, 15 Aug 2024 17:37:59 -0400 Subject: [PATCH] rebase Signed-off-by: drfaust92 --- charts/tempo-distributed/README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 37185fa45a..9089cc8c1c 100755 --- 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