Fixed conflicts during the last stable update

This commit is contained in:
2019-07-01 10:04:48 -05:00
101 changed files with 62556 additions and 14475 deletions

View File

@@ -28,4 +28,4 @@ git+https://github.com/manuelcortez/twython
git+https://github.com/manuelcortez/libloader
git+https://github.com/manuelcortez/platform_utils
git+https://github.com/manuelcortez/accessible_output2
git+https://github.com/chrisnorman7/sound_lib
git+https://github.com/jmdaweb/sound_lib