fix conflicts

This commit is contained in:
Bryan Jenks 2020-12-12 13:20:31 -08:00 committed by GitHub
parent 3cebfddb85
commit 7cc65111e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -193,6 +193,7 @@
- [Aveek Saha](https://github.com/Aveek-Saha/Aveek-Saha)
- [Federico Dondi](https://github.com/federico-dondi)
- [Zheeeng](https://github.com/Zheeeng/Zheeeng)
- [TallGuyJenks](https://github.com/tallguyjenks/tallguyjenks)
#### GIFS 👻
- [Pouya Saadeghi](https://github.com/saadeghi/saadeghi)