From 0e775a674b5818de3d8c278f4ced86a22c394221 Mon Sep 17 00:00:00 2001
From: Ee Durbin <ewdurbin@gmail.com>
Date: Tue, 1 Oct 2024 18:49:38 -0400
Subject: [PATCH] fix fix merge conflictf

---
 salt/docs/config/nginx.docs-redirects.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/docs/config/nginx.docs-redirects.conf b/salt/docs/config/nginx.docs-redirects.conf
index 84501f26..f9acd66f 100644
--- a/salt/docs/config/nginx.docs-redirects.conf
+++ b/salt/docs/config/nginx.docs-redirects.conf
@@ -1,5 +1,4 @@
 # This file contains redirect configuration for docs.python.org.
-
 # It is included by ``nginx.docs-backend.conf``,
 # and tested in ``tests/docs-redirects/``.