use relative links to stable docs in warning alert (fixes env issue)

Author: AyushPatiTripathi

docs/templates/docs/doc.html

@@ -38,16 +38,10 @@
   {% if release.is_dev %}
     {% if "internals" not in docurl %}{# The dev version is canonical for internals/. #}
       <div id="dev-warning" class="doc-floating-warning">
-<<<<<<< HEAD
         {% blocktrans trimmed %}
           This document is for Django's development version, which can be significantly different from previous releases.
           <a href="{% url 'docs_version' version='stable %}" style="font-weight : bold; text-decoration: underline;"> Click here for the stable version </a>
-=======
-      {% blocktrans trimmed %}
-      This document is for Django's development version, which can be significantly different from previous releases.
-        <a href="/en/stable/" style="font-weight : bold; text-decoration: underline;"> Click here for the stable version </a>
->>>>>>> ead4fc41 (use relative links to stable docs in warning alert (fixes env issue))
-        {% endblocktrans %}
+          {% endblocktrans %}
       </div>
     {% endif %}
   {% elif release.is_preview %}