conflicts

This commit is contained in:
Aditya 2024-04-27 21:46:23 +05:30
parent cd2435edaf
commit 2f1066a0a3
2 changed files with 1729 additions and 933 deletions

2658
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -500,5 +500,7 @@
"your_account": "Your account",
"your_account_description": "Spacedrive account and information.",
"your_local_network": "Your Local Network",
"your_privacy": "Your Privacy"
"your_privacy": "Your Privacy",
"zoom_in": "Zoom In",
"zoom_out": "Zoom Out"
}