ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2026-02-03 09:22:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove merge conflict markers from lang-list.json

Browse Source
This commit is contained in:
maghuro
2026-01-31 12:10:36 +00:00
committed by GitHub
parent 3db02370fd
commit c515815b0e
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/locale/src/lang-list.json
View File

@@ -1,5 +1,4 @@
{ {
<<<<<<< HEAD
"locale-en-US": { "locale-en-US": {
"defaultMessage": "English" "defaultMessage": "English"
}, },