ruff fix

krrish-sehgal · Nov 11, 2024 · 38f672d · 38f672d
1 parent 10cba3a
commit 38f672d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/website/class_views.py b/website/class_views.py
@@ -2414,4 +2414,3 @@ class ReportedIpListView(ListView):
 
     def get_queryset(self):
         return IpReport.objects.all().order_by("-created")
-
diff --git a/website/templates/includes/header.html b/website/templates/includes/header.html
@@ -149,7 +149,7 @@
                         </select>
                     </form>
                 </div>
-<<<<<<< HEAD
+                <<<<<<< HEAD
                 <a href="{% url 'report' %}"
                    class="flex lg:hidden ml-5 h-[38px] border border-black rounded-3xl p-2 shadow">
                     <img src="{% static 'images/report_issue.png' %}"
@@ -170,8 +170,8 @@
                    class="lg:!inline-block hidden bg-red-500 hover:bg-red-600 h-[38px] py-[8px] px-[20px] whitespace-nowrap !text-2xl font-bold text-white leading-[21px] cursor-pointer hover:text-white hover:no-underline rounded-xl tracking-wide">
                     {% trans "Bug Bounties" %}
                 </a>
-=======
->>>>>>> d554f7e2c7d89409b257f35e2170e1c8bbce1628
+                =======
+                >>>>>>> d554f7e2c7d89409b257f35e2170e1c8bbce1628
             </div>
             {% if request.user.is_authenticated %}
                 <li class="h-[80px] flex justify-center items-center ">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2414,4 +2414,3 @@ class ReportedIpListView(ListView):

		def get_queryset(self):
		return IpReport.objects.all().order_by("-created")