Fixed the conflict in the previous PR. (#2886)

.changelog

@@ -1,4 +1,3 @@
-<<<<<<< HEAD:.changelog
 # Write your changes here, new entries at the top, in correct format:
 # - Updated Foo chapter in Installation and Upgrade Guide for readability
 # - Documented Bar feature in Administration Guide

modules/administration/pages/ssl-certs-hsts.adoc

@@ -6,27 +6,15 @@ HTTP Strict Transport Security (https://developer.mozilla.org/en-US/docs/Web/HTT
 
 {productname} allows enabling HSTS, to enable it for a {productname} Server:
 
-<<<<<<< HEAD
-1. Edit `/etc/apache2/conf.d/zz-spacewalk-www.conf`
-2. Uncomment the line `# Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains"`
-=======
 .Procedure
 1. Create new configuration file in  `/etc/apache2/conf.d/<filename>.conf`, for example `/etc/apache2/conf.d/zz-spacewalk-www-custom.conf`.
 2. Add line `Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains"`
->>>>>>> ed03d466e (Clearer instructions for HTTP Strict Transport Security (#2875))
 3. Restart Apache with `systemctl restart apache2`
 
 
 
 To enable it for {productname} Proxies:
 
-<<<<<<< HEAD
-1. Edit `/etc/apache2/conf.d/spacewalk-proxy.conf`
-2. Uncomment the line `# Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains"`
-3. Restart Apache with `systemctl restart apache2`
-
-**IMPORTANT:** Once HSTS is enabled while using the default SSL certificate generated by {productname} or a self-signed certificate, browsers will refuse to connect using HTTPS unless the CA used to sign such certificates is trusted by the browser.
-=======
 .Procedure
 1. Create new configuration file in  `/etc/apache2/conf.d/<filename>.conf`, for example `/etc/apache2/conf.dz/zz-spacewalk-proxy-custom.conf`.
 2. Add line `Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains"`
@@ -45,5 +33,5 @@ For more information about how Apache loads files, see https://httpd.apache.org/
 [IMPORTANT] 
 ====
 When HSTS is enabled while using the default SSL certificate generated by {productname} or a self-signed certificate, browsers will refuse to connect with HTTPS unless the CA used to sign such certificates is trusted by the browser.
->>>>>>> ed03d466e (Clearer instructions for HTTP Strict Transport Security (#2875))
 If you are using the SSL certificate generated by {productname}, you can trust it by importing the file located at `http://<SERVER-HOSTNAME>/pub/RHN-ORG-TRUSTED-SSL-CERT` to the browsers of all users.
+====