From c1f46a9cb03bad6efc5ad24e6911b953dfdd9eab Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 15 Dec 2018 16:29:44 -0600
Subject: [PATCH] Update README.httpd

---
 distros/redhat/readme/README.httpd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/distros/redhat/readme/README.httpd b/distros/redhat/readme/README.httpd
index cb5805b18..5301850df 100644
--- a/distros/redhat/readme/README.httpd
+++ b/distros/redhat/readme/README.httpd
@@ -146,13 +146,8 @@ Upgrades
    See step 6 of the installation section if you have not already done this
    during a previous upgrade.
 
-<<<<<<< HEAD
-   If this step is not performed correctly, the web console will appear
-   mostly empty and/or significantly corrupted post-upgrade. 
-=======
    IMPORTANT: Failure to complete this step properly will result in a mostly
    empty or significantly corrupted web console post-upgrade.
->>>>>>> 5b211d250910918782d20bf32b0e33a38a0df4dd
 
 4. Upgrade the database before starting ZoneMinder.