This commit is contained in:
tiago.kayaya
2021-01-22 16:01:44 +01:00
95 changed files with 3733 additions and 8202 deletions
File diff suppressed because one or more lines are too long
@@ -1,4 +1,4 @@
#Fri Jan 15 10:37:59 WAT 2021
#Wed Jan 20 10:20:16 WAT 2021
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
@@ -1,4 +1,8 @@
<<<<<<< HEAD
#Wed Jan 20 13:37:00 WAT 2021
=======
#Thu Jan 21 09:26:08 WAT 2021
>>>>>>> feature/chat
path.3=classes_1.dex
path.2=classes_0.dex
path.1=classes.dex