removed merge conflicts
This commit is contained in:
@@ -70,14 +70,6 @@
|
||||
"username_claimed": "dens",
|
||||
"username_unclaimed": "noonewouldeverusethis7"
|
||||
},
|
||||
"furaffinity": {
|
||||
"errorMsg": "user cannot be found",
|
||||
"errorType": "message",
|
||||
"url": "https://www.furaffinity.net/user/{}",
|
||||
"urlMain": "https://www.furaffinity.net",
|
||||
"username_claimed": "blue",
|
||||
"username_unclaimed": "noonewouldeverusethis777777"
|
||||
},
|
||||
"gpodder.net": {
|
||||
"errorType": "status_code",
|
||||
"url": "https://gpodder.net/user/{}",
|
||||
|
||||
Reference in New Issue
Block a user