Attempt to resolve merge conflict

[akkoma] / installation / pleroma-apache.conf

diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index cbb165064e55480bfb24b890bf360640fc7bad7f..d5e75044fc578ef05232a165db465c526ddd7e6d 100644 (file)
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -34,9 +34,6 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
     SSLCompression          off
     SSLSessionTickets       off
 
-    # Uncomment this only after you get HTTPS working.
-    # Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"
-
     RewriteEngine On
     RewriteCond %{HTTP:Connection} Upgrade [NC]
     RewriteCond %{HTTP:Upgrade} websocket [NC]