Fixed conflicts

This commit is contained in:
Twentysix
2016-01-21 14:33:18 +01:00
3 changed files with 144 additions and 31 deletions

4
.gitignore vendored
View File

@@ -45,4 +45,6 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk
__pycache__
__pycache__
json
cache