Merge with developer brunch

This commit is contained in:
Eudes Inácio
2021-02-10 10:37:13 +01:00
1735 changed files with 6305 additions and 250030 deletions
+4 -1
View File
@@ -4,5 +4,8 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Mon Feb 08 20:47:07 WAT 2021
#Wed Feb 10 10:10:30 WAT 2021
>>>>>>>=developer
sdk.dir=C\:\\Users\\eudes.inacio\\AppData\\Local\\Android\\Sdk
=\=\=\=\=\=\=
<<<<<<<=HEAD