From 2a91be31581c19270c998bf8cb51fde0fb23a36b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 16 Apr 2025 13:26:14 +0200 Subject: [PATCH] chore: Resolve conflicts --- frappe/desk/page/backups/backups.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/frappe/desk/page/backups/backups.py b/frappe/desk/page/backups/backups.py index e6a726d7a1..3e1c1fb20f 100644 --- a/frappe/desk/page/backups/backups.py +++ b/frappe/desk/page/backups/backups.py @@ -29,17 +29,8 @@ def get_size(path: Path): def get_context(context): -<<<<<<< HEAD - def get_time(path): - dt = os.path.getmtime(path) - return convert_utc_to_system_timezone( - datetime.datetime.fromtimestamp(dt, tz=datetime.timezone.utc) - ).strftime("%a %b %d %H:%M %Y") -======= context.no_cache = True backup_limit = frappe.get_system_settings("backup_limit") ->>>>>>> c3b5443896 (refactor(minor): Backups Page) - backups_path = Path(get_site_path("private", "backups")) backup_files = [ (