From ef5d04fc4ae6c8438146d523343e781bc410f63e Mon Sep 17 00:00:00 2001
From: amyangfei <amyangfei@gmail.com>
Date: Thu, 24 Jun 2021 14:33:41 +0800
Subject: [PATCH] Update metrics/grafana/ticdc.json

---
 metrics/grafana/ticdc.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/metrics/grafana/ticdc.json b/metrics/grafana/ticdc.json
index a5af18c6bc5..16f25b92821 100644
--- 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))
 }