From 2cdf6ffde0e4dcbcb4bfbfde052aa20d2d7003e0 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 25 Jan 2021 13:44:09 -0500 Subject: [PATCH] Fix merge conflict error text --- modules/cluster-logging-deploy-cli.adoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/cluster-logging-deploy-cli.adoc b/modules/cluster-logging-deploy-cli.adoc index 49d5b7ed73..8fe20af605 100644 --- a/modules/cluster-logging-deploy-cli.adoc +++ b/modules/cluster-logging-deploy-cli.adoc @@ -181,11 +181,7 @@ There should be an Elasticsearch Operator in each Namespace. The version number . Install the Cluster Logging Operator by creating the following objects: -<<<<<<< HEAD .. Create an OperatorGroup object YAML file (for example, `clo-og.yaml`) for the Cluster Logging Operator: -======= -.. Create an Operator Group object YAML file (for example, `clo-og.yaml`) for the Cluster Logging Operator: ->>>>>>> 3353f1b68 (RHDEVDOCS-2493 Logging: Change name from "cluster logging" to "OpenShift Logging") + [source,yaml] ----