vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: Resolve conflicts

Browse source
This commit is contained in:
Gavin D'souza 2025-04-16 13:26:14 +02:00
parent 98a807af89
commit 2a91be3158
No known key found for this signature in database
GPG key ID: 5413A43FBD450A34
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/desk/page/backups/backups.py
View file

@ -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 = [
(