diff options
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 |