From 6336ef9db1a6e630ba716c41ab649527fafd9da3 Mon Sep 17 00:00:00 2001 From: Slipstream Date: Wed, 4 Jun 2025 20:57:50 -0600 Subject: [PATCH] fix: Resolve merge conflict in _build_new_post_view method for media gallery display --- cogs/gelbooru_watcher_base_cog.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/cogs/gelbooru_watcher_base_cog.py b/cogs/gelbooru_watcher_base_cog.py index 55445ed..2f5e64f 100644 --- a/cogs/gelbooru_watcher_base_cog.py +++ b/cogs/gelbooru_watcher_base_cog.py @@ -521,23 +521,10 @@ class GelbooruWatcherBaseCog(commands.Cog, abc.ABC, metaclass=GelbooruWatcherMet container = ui.Container() view.add_item(container) -<<<<<<< ours -<<<<<<< ours - gallery = ui.MediaGallery(ui.MediaGalleryItem(media=file_url)) - section = ui.Section(accessory=gallery) - container.add_item(section) - section.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:")) -======= -======= ->>>>>>> theirs gallery = ui.MediaGallery() gallery.add_item(media=file_url) container.add_item(gallery) container.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:")) -<<<<<<< ours ->>>>>>> theirs -======= ->>>>>>> theirs container.add_item(ui.TextDisplay(file_url)) return view