mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2026-02-03 17:32:54 +00:00
Remove merge conflict markers from lang-list.json
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"locale-en-US": {
|
||||
"defaultMessage": "English"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user