peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/pushNotifications' into dev

Browse Source
This commit is contained in:
tiago.kayaya
2021-02-08 16:20:43 +01:00
parent e81e929b61 c94f726579
commit 68747f98da
152 changed files with 12602 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json
+4
View File
@@ -1,7 +1,11 @@
{
"logs": [
{
<<<<<<< HEAD
"outputFile": "C:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-v21\\values-v21.xml",