pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-06 02:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge confilct

Browse Source
This commit is contained in:
Owen
2025-11-08 18:01:42 -08:00
parent 2428413442
commit 2973b61676
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
messages/en-US.json
View File

@@ -2153,14 +2153,9 @@
"selectedResources": "Selected Resources", "selectedResources": "Selected Resources",
"enableSelected": "Enable Selected", "enableSelected": "Enable Selected",
"disableSelected": "Disable Selected", "disableSelected": "Disable Selected",
<<<<<<< HEAD
"checkSelectedStatus": "Check Status of Selected", "checkSelectedStatus": "Check Status of Selected",
"clients": "Clients", "clients": "Clients",
"accessClientSelect": "Select machine clients", "accessClientSelect": "Select machine clients",
"resourceClientDescription": "Machine clients that can access this resource", "resourceClientDescription": "Machine clients that can access this resource",
"regenerate": "Regenerate" "regenerate": "Regenerate"
} }
=======
"checkSelectedStatus": "Check Status of Selected"
}
>>>>>>> dev