Resolving merge conflicts

Introduced because of #1537
pull/1531/head
Naveen Namani 2 years ago committed by GitHub
parent 59cd6b3dea
commit 73d693dd9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -851,14 +851,6 @@
"username_claimed": "blue",
"username_unclaimed": "noonewouldeverusethis7"
},
"Google Developer": {
"errorMsg": "Sorry, the profile was not found.",
"errorType": "message",
"url": "https://g.dev/{}",
"urlMain": "https://g.dev/",
"username_claimed": "blue",
"username_unclaimed": "noonewouldeverusethis7"
},
"Google Play": {
"errorMsg": "the requested URL was not found on this server",
"errorType": "message",

Loading…
Cancel
Save