GitHub-43098: Removing duplicate step and other issues from an incorrect merge conflict resolution

Author: bergerhoffer

modules/installation-adding-registry-pull-secret.adoc

@@ -54,19 +54,7 @@ endif::restricted[]
 Complete the following steps on the installation host:
 
 ifndef::openshift-origin[]
-. Download your `registry.redhat.io` {cluster-manager-url-pull} and save it to a `.json` file.
-endif::[]
-
-. Generate the base64-encoded user name and password or token for your mirror
-registry:
-+
-[source,terminal]
-----
-$ echo -n '<user_name>:<password>' | base64 -w0 <1>
-BGVtbYk3ZHAtqXs=
-----
-<1> For `<user_name>` and `<password>`, specify the user name and password that
-you configured for your registry.
+. Download your `registry.redhat.io` {cluster-manager-url-pull}.
 
 . Make a copy of your pull secret in JSON format:
 +
@@ -106,6 +94,7 @@ The contents of the file resemble the following example:
   }
 }
 ----
+endif::[]
 
 . Generate the base64-encoded user name and password or token for your mirror registry:
 +
@@ -117,7 +106,7 @@ BGVtbYk3ZHAtqXs=
 <1> For `<user_name>` and `<password>`, specify the user name and password that you configured for your registry.
 
 ifndef::openshift-origin[]
-. Edit the new
+. Edit the JSON
 endif::[]
 ifdef::openshift-origin[]
 . Create a `.json`