Revert "Fix conflicts"

This reverts commit f3451745d3, reversing
changes made to c5d4d5533d.
This commit is contained in:
neslihanturan 2019-09-17 17:36:53 +03:00
parent f3451745d3
commit 148c891580
44 changed files with 166 additions and 1397 deletions

View file

@ -46,7 +46,6 @@ their contribution to the product.
* Ilgaz Er
* Alicia Bendz
* Kaartic Sivaraam
* Vanshika Arora
3rd party open source libraries used:
* Butterknife