remove conflict files

This commit is contained in:
KAiZ 2019-11-19 15:30:56 +05:30
parent ca6d856a5b
commit 049c0ced0d

4
.gitignore vendored
View file

@ -1,2 +1,4 @@
env
.vscode
.vscode
Bibata.sh
README.md