fix conflicts

Signed-off-by: Neil Shen <overvenus@gmail.com>
pingcap · Nov 10, 2021 · b1a2143 · b1a2143
1 parent 4e85206
commit b1a2143
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/metrics/grafana/ticdc.json b/metrics/grafana/ticdc.json
@@ -3193,8 +3193,6 @@
             "align": false,
             "alignLevel": null
           }
-<<<<<<< HEAD
-=======
         },
         {
           "columns": [],
@@ -3348,7 +3346,6 @@
             }
           ],
           "type": "table"
->>>>>>> 837508bbc (metrics: add changefeed checkepoint catch-up ETA (#3300))
         }
       ],
       "title": "Changefeed",