From aa427e152829ef8fd66392930ff8d6dd615eeb25 Mon Sep 17 00:00:00 2001
From: kelseiv <47797004+kelseiv@users.noreply.github.com>
Date: Fri, 12 Mar 2021 16:00:46 -0800
Subject: [PATCH] Update release-notes-changelog.md

---
 .../chronograf/v1.8/about_the_project/release-notes-changelog.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/content/chronograf/v1.8/about_the_project/release-notes-changelog.md b/content/chronograf/v1.8/about_the_project/release-notes-changelog.md
index 5495316fe..463739267 100644
--- a/content/chronograf/v1.8/about_the_project/release-notes-changelog.md
+++ b/content/chronograf/v1.8/about_the_project/release-notes-changelog.md
@@ -15,7 +15,6 @@ menu:
 - Add the ability to set the active InfluxDB database and retention policy for InfluxQL commands. Now, in Chronograf Data Explorer, if you select a metaquery template (InfluxQL command) that requires you to specify an active database, such as `DROP MEASUREMENT`, `DROP SERIES FROM`, and `DELETE FROM`, the `USE` command is prepended to your InfluxQL command as follows:
 
 ```
->>>>>>> c9cc1028a5aae0097eaad28b6841111d192c82c1
 USE "db_name"; DROP MEASUREMENT "measurement_name"
 USE "db_name"; DROP SERIES FROM "measurement_name" WHERE "tag" = 'value'
 USE "db_name"; DELETE FROM "measurement_name" WHERE "tag" = 'value' AND time < '2020-01-01'