fix conflicts

Author: norkans7

templates/public_base.html

@@ -272,11 +272,7 @@
             </div>
             <div class="md:w-1/4 rtl:float-left rtl:text-left ltr:float-right ltr:text-right   inline-block mb-4">
                 <a href="#"
-<<<<<<< HEAD
                    class="btn bg-light1-v2024 text-black inline-block download-screenshot hover-dark">Download</a>
-=======
-                   class="btn bg-light1-home text-black inline-block download-screenshot hover-dark">Download</a>
->>>>>>> 8396dbd6 (fix conflicts)
             </div>
             <div class="mt-4 shadow">
                 <img src="#" alt="" class="screenshot-rendered">
@@ -791,11 +787,7 @@
                         {% endif %}
                     </div>
                     <a href="{% url 'public.ureporters' %}"
-<<<<<<< HEAD
                        class="btn bg-light2-v2024 text-white inline-block hover-dark">{% trans "EXPLORE ENGAGEMENT" %}</a>
-=======
-                       class="btn bg-light2-home text-white inline-block hover-dark">{% trans "EXPLORE ENGAGEMENT" %}</a>
->>>>>>> 8396dbd6 (fix conflicts)
                 </div>
             </div>
         </div>