From 13d47cf33bba73af4156d9291c6d641128bbbcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Thu, 13 Jun 2024 12:44:11 +0200
Subject: [PATCH] fix conflict
---
shared/models/main.py | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/shared/models/main.py b/shared/models/main.py
index e9eee5f8..cc548076 100644
--- a/shared/models/main.py
+++ b/shared/models/main.py
@@ -255,13 +255,6 @@ class PageInMenuMixin(Page):
for menu in menu_iterator:
if menu.block_type == "menu_item":
if (
-<<<<<<< HEAD
- instance.full_url is not None
- and len(instance.full_url) != 0
- and menu.value["link"] is not None
- and len(menu.value["link"]) != 0
- ) and menu.value["link"].strip() == instance.full_url.strip():
-=======
menu.value["link"].strip()
if menu.value["link"] is not None
else ""
@@ -270,7 +263,6 @@ class PageInMenuMixin(Page):
if instance.full_url
else ""
):
->>>>>>> 8671dd739c03d668ed1b01173e5ce36ead1a6a3b
return menu.value["title"]
if menu.value["page"] is None:
@@ -281,14 +273,6 @@ class PageInMenuMixin(Page):
elif menu.block_type == "menu_parent":
for item in menu.value["menu_items"]:
if (
-<<<<<<< HEAD
- instance.full_url is not None
- and len(instance.full_url) != 0
- and item.value["link"] is not None
- and len(menu.value["link"]) != 0
- ) and item.value["link"].strip() == instance.full_url.strip():
- return item.value["title"]
-=======
item["link"].strip()
if item["link"] is not None
else ""
@@ -298,7 +282,6 @@ class PageInMenuMixin(Page):
else ""
):
return menu.value["title"]
->>>>>>> 8671dd739c03d668ed1b01173e5ce36ead1a6a3b
if item["page"] is None:
continue
--
GitLab