diff options
Diffstat (limited to 'ATRI/plugins/noobList/noobList.json')
| -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 |