Review comments.

grafana · Aug 25, 2021 · 6422e0b · 6422e0b
1 parent 8136443
commit 6422e0b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,7 +51,6 @@
   * `CortexAlertmanagerReplicationFailing`
   * `CortexAlertmanagerPersistStateFailing`
   * `CortexAlertmanagerInitialSyncFailed`
->>>>>>> Add new alerts for alertmanager sharding mode of operation.
 * [BUGFIX] Fixed `CortexIngesterHasNotShippedBlocks` alert false positive in case an ingester instance had ingested samples in the past, then no traffic was received for a long period and then it started receiving samples again. #308
 * [BUGFIX] Alertmanager: fixed `--alertmanager.cluster.peers` CLI flag passed to alertmanager when HA is enabled. #329
 * [BUGFIX] Fixed `CortexInconsistentRuntimeConfig` metric. #335