diff options
Diffstat (limited to 'ATRI/plugins/noobList')
| -rw-r--r-- | ATRI/plugins/noobList/noobGroup.json | 1 | ||||
| -rw-r--r-- | ATRI/plugins/noobList/noobList.json | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ATRI/plugins/noobList/noobGroup.json b/ATRI/plugins/noobList/noobGroup.json new file mode 100644 index 0000000..6e1ba39 --- /dev/null +++ b/ATRI/plugins/noobList/noobGroup.json @@ -0,0 +1 @@ +{"123": "123"}
\ No newline at end of file diff --git a/ATRI/plugins/noobList/noobList.json b/ATRI/plugins/noobList/noobList.json index 021e00a..31edd3f 100644 --- a/ATRI/plugins/noobList/noobList.json +++ b/ATRI/plugins/noobList/noobList.json @@ -1 +1,5 @@ +<<<<<<< HEAD {"123": "123"} +======= +{"123": "123"} +>>>>>>> eb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7 |