mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-19 09:26:06 -05:00
Fixed conflicts
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -45,4 +45,6 @@ $RECYCLE.BIN/
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
__pycache__
|
||||
__pycache__
|
||||
json
|
||||
cache
|
||||
Reference in New Issue
Block a user