diff options
| author | Kyomotoi <[email protected]> | 2020-08-18 00:29:10 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-18 00:29:10 +0800 |
| commit | 032e6c47c127e58a660d810b84f1e7e2d501fba2 (patch) | |
| tree | 52ee6d4f4d98a4f43cc9dc4e5adf714af136710f /ATRI/plugins | |
| parent | fccaa44115f71d46b2ee76cde8b367c191229630 (diff) | |
| download | ATRI-032e6c47c127e58a660d810b84f1e7e2d501fba2.tar.gz ATRI-032e6c47c127e58a660d810b84f1e7e2d501fba2.tar.bz2 ATRI-032e6c47c127e58a660d810b84f1e7e2d501fba2.zip | |
Update noobList.json
Diffstat (limited to 'ATRI/plugins')
| -rw-r--r-- | ATRI/plugins/noobList/noobList.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ATRI/plugins/noobList/noobList.json b/ATRI/plugins/noobList/noobList.json index 31edd3f..021e00a 100644 --- a/ATRI/plugins/noobList/noobList.json +++ b/ATRI/plugins/noobList/noobList.json @@ -1,5 +1 @@ -<<<<<<< HEAD {"123": "123"} -======= -{"123": "123"} ->>>>>>> eb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7 |