diff options
| author | Kyomotoi <[email protected]> | 2020-08-18 00:28:14 +0800 |
|---|---|---|
| committer | Kyomotoi <[email protected]> | 2020-08-18 00:28:14 +0800 |
| commit | fccaa44115f71d46b2ee76cde8b367c191229630 (patch) | |
| tree | 6adcedde05feeccab884fb856ffacfc825c714ca /ATRI/plugins/noobList | |
| parent | 0bd751a03a1c38b990caee19d7cc4e28c906bcea (diff) | |
| parent | eb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7 (diff) | |
| download | ATRI-fccaa44115f71d46b2ee76cde8b367c191229630.tar.gz ATRI-fccaa44115f71d46b2ee76cde8b367c191229630.tar.bz2 ATRI-fccaa44115f71d46b2ee76cde8b367c191229630.zip | |
[Fix]
Diffstat (limited to 'ATRI/plugins/noobList')
| -rw-r--r-- | ATRI/plugins/noobList/noobList.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ATRI/plugins/noobList/noobList.json b/ATRI/plugins/noobList/noobList.json index 6e1ba39..31edd3f 100644 --- a/ATRI/plugins/noobList/noobList.json +++ b/ATRI/plugins/noobList/noobList.json @@ -1 +1,5 @@ -{"123": "123"}
\ No newline at end of file +<<<<<<< HEAD +{"123": "123"} +======= +{"123": "123"} +>>>>>>> eb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7 |