diff options
Diffstat (limited to 'ATRI')
| -rw-r--r-- | ATRI/plugins/BlackList.py | 2 | ||||
| -rw-r--r-- | ATRI/plugins/noobList/noobList.json | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ATRI/plugins/BlackList.py b/ATRI/plugins/BlackList.py index b23f22f..5a470ed 100644 --- a/ATRI/plugins/BlackList.py +++ b/ATRI/plugins/BlackList.py @@ -49,4 +49,4 @@ async def _(session: CommandSession): end = time.perf_counter() msg0 = f"=============\nDone time: {round(end - start, 3)}s" msg += msg0 - await session.send(msg)
\ No newline at end of file + await session.send(msg) 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 |