Update metrics/grafana/ticdc.json

pingcap · Jun 24, 2021 · ef5d04f · ef5d04f
1 parent 9c6cd8f
commit ef5d04f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/metrics/grafana/ticdc.json b/metrics/grafana/ticdc.json
@@ -7065,9 +7065,5 @@
  "timezone": "browser",
  "title": "Test-Cluster-TiCDC",
  "uid": "YiGL8hBZ1",
-<<<<<<< HEAD
- "version": 15
-=======
  "version": 16
->>>>>>> ca64c784 (metrics: add metrics for table memory consumption (#1846))
 }