openshift/openshift-docs
1
0
Fork 0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-06 06:46:26 +01:00
Code Issues Releases Activity

Fix merge conflict error text

Browse Source
This commit is contained in:
Bob
2021-01-25 13:44:09 -05:00
parent a0d34bade7
commit 2cdf6ffde0
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cluster-logging-deploy-cli.adoc
View File

@@ -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]
----