From 9730b68b03d01cb4fa6e0262b8aa56e4930748da Mon Sep 17 00:00:00 2001 From: PlushZ Date: Sun, 5 Apr 2026 12:15:20 +1000 Subject: [PATCH] Resolve remaining merge markers --- lib/galaxy/files/sources/onedrive.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/galaxy/files/sources/onedrive.py b/lib/galaxy/files/sources/onedrive.py index db1da53ad88..9548bb21e85 100644 --- a/lib/galaxy/files/sources/onedrive.py +++ b/lib/galaxy/files/sources/onedrive.py @@ -81,14 +81,10 @@ class OneDriveFilesSource( return f"{api_base}/special/approot" def _children_url(self, config: OneDriveFilesSourceConfiguration, path: str) -> str: -<<<<<<< HEAD - return f"{self._item_url(config, path)}/children" -======= item_url = self._item_url(config, path) if path.strip("/"): return f"{item_url}:/children" return f"{item_url}/children" ->>>>>>> 4132e5d794 (Add OneDrive file source) def _content_url(self, config: OneDriveFilesSourceConfiguration, path: str) -> str: return f"{self._item_url(config, path)}:/content" if path.strip("/") else f"{self._item_url(config, path)}/content" @@ -196,14 +192,10 @@ class OneDriveFilesSource( def _create_entry( self, entry_data: EntryData, context: FilesSourceRuntimeContext[OneDriveFilesSourceConfiguration] ) -> Entry: -<<<<<<< HEAD - parent_path = getattr(entry_data, "path", "/") -======= parent_path = getattr(entry_data, "path", None) if parent_path is None: target = getattr(entry_data, "target", "/") parent_path = self.to_relative_path(target) ->>>>>>> 4132e5d794 (Add OneDrive file source) payload = { "name": entry_data.name, "folder": {},