peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +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/.idea/runConfigurations.xml
Generated
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>
android/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+9018 -145
View File
File diff suppressed because it is too large Load Diff
android/app/build/intermediates/blame/res/debug/multi-v2/values-af.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-af\\values-af.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-af\\values-af.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-am.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-am\\values-am.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-am\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ar.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-ar\\values-ar.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ar\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-as.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-as\\values-as.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-as\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-az.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-az\\values-az.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-az\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.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-b+sr+Latn\\values-b+sr+Latn.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-be.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-be\\values-be.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-be\\values-be.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-bg.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-bg\\values-bg.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-bg\\values-bg.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-bn.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-bn\\values-bn.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-bn\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-bs.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-bs\\values-bs.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-bs\\values-bs.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ca.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-ca\\values-ca.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-ca\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-cs.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-cs\\values-cs.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-cs\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-da.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-da\\values-da.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-da\\values-da.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-de.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-de\\values-de.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-de\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-el.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-el\\values-el.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-el\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.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-en-rAU\\values-en-rAU.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rAU\\values-en-rAU.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.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-en-rCA\\values-en-rCA.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rCA\\values-en-rCA.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.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-en-rGB\\values-en-rGB.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-en-rGB\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.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-en-rIN\\values-en-rIN.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-en-rIN\\values-en-rIN.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.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-en-rXC\\values-en-rXC.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-en-rXC\\values-en-rXC.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.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-es-rUS\\values-es-rUS.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-es-rUS\\values-es-rUS.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-es.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-es\\values-es.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-es\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-et.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-et\\values-et.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-et\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-eu.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-eu\\values-eu.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-eu\\values-eu.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-fa.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-fa\\values-fa.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fa\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-fi.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-fi\\values-fi.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fi\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.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-fr-rCA\\values-fr-rCA.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-fr-rCA\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-fr.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-fr\\values-fr.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-fr\\values-fr.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-gl.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-gl\\values-gl.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-gl\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-gu.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-gu\\values-gu.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-gu\\values-gu.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.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-h360dp-land-v13\\values-h360dp-land-v13.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-h360dp-land-v13\\values-h360dp-land-v13.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.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-h480dp-land-v13\\values-h480dp-land-v13.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-h480dp-land-v13\\values-h480dp-land-v13.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.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-h720dp-v13\\values-h720dp-v13.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.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-hdpi-v4\\values-hdpi-v4.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-hi.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-hi\\values-hi.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hi\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-hr.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-hr\\values-hr.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-hr\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-hu.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-hu\\values-hu.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-hu\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-hy.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-hy\\values-hy.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-hy\\values-hy.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-in.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-in\\values-in.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-in\\values-in.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-is.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-is\\values-is.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-is\\values-is.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-it.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-it\\values-it.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-it\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-iw.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-iw\\values-iw.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-iw\\values-iw.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ja.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-ja\\values-ja.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ja\\values-ja.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ka.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-ka\\values-ka.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ka\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-kk.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-kk\\values-kk.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-kk\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-km.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-km\\values-km.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-km\\values-km.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-kn.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-kn\\values-kn.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-kn\\values-kn.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ko.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-ko\\values-ko.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-ko\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ky.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-ky\\values-ky.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ky\\values-ky.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-land.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-land\\values-land.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-land\\values-land.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.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-large-v4\\values-large-v4.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-large-v4\\values-large-v4.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-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-ldltr-v21\\values-ldltr-v21.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-lo.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-lo\\values-lo.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-lo\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-lt.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-lt\\values-lt.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-lt\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-lv.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-lv\\values-lv.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-lv\\values-lv.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-mk.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-mk\\values-mk.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-mk\\values-mk.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ml.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-ml\\values-ml.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ml\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-mn.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-mn\\values-mn.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-mn\\values-mn.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-mr.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-mr\\values-mr.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-mr\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ms.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-ms\\values-ms.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-ms\\values-ms.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-my.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-my\\values-my.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-my\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-nb.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-nb\\values-nb.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-nb\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ne.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-ne\\values-ne.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ne\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.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-night-v8\\values-night-v8.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-night-v8\\values-night-v8.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-nl.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-nl\\values-nl.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-nl\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-or.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-or\\values-or.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-or\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-pa.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-pa\\values-pa.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pa\\values-pa.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-pl.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-pl\\values-pl.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\9d9f5eefb5bcc469207d44112eb03d4a\\jetified-play-services-base-17.0.0\\res\\values-pl\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-port.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-port\\values-port.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-port\\values-port.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.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-pt-rBR\\values-pt-rBR.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.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-pt-rPT\\values-pt-rPT.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-pt.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-pt\\values-pt.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-pt\\values-pt.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ro.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-ro\\values-ro.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-ro\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ru.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-ru\\values-ru.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ru\\values-ru.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-si.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-si\\values-si.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-si\\values-si.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sk.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-sk\\values-sk.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-sk\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sl.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-sl\\values-sl.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sl\\values-sl.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.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-small-v4\\values-small-v4.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-small-v4\\values-small-v4.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-small-v4\\values-small-v4.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sq.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-sq\\values-sq.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-sq\\values-sq.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sr.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-sr\\values-sr.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sr\\values-sr.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sv.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-sv\\values-sv.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-sv\\values-sv.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sw.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-sw\\values-sw.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-sw\\values-sw.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.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-sw600dp-v13\\values-sw600dp-v13.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ta.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-ta\\values-ta.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-ta\\values-ta.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-te.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-te\\values-te.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-te\\values-te.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-th.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-th\\values-th.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\e5357b0b880d2be0ed83398576c19d42\\core-1.2.0\\res\\values-th\\values-th.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-tl.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-tl\\values-tl.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\ec0d34db7bfab328a67bc775742a1d9e\\jetified-firebase-messaging-20.1.2\\res\\values-tl\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-tr.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-tr\\values-tr.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-tr\\values-tr.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-uk.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-uk\\values-uk.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-uk\\values-uk.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-ur.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-ur\\values-ur.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\caa5198f0ae08d91561862daa07e196f\\browser-1.2.0\\res\\values-ur\\values-ur.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-uz.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-uz\\values-uz.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\f258e3825c6af3b14c7ec1616fae4742\\jetified-play-services-basement-17.0.0\\res\\values-uz\\values.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-v16.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-v16\\values-v16.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v16\\values-v16.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-v17.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-v17\\values-v17.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v17\\values-v17.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-v18.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-v18\\values-v18.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v18\\values-v18.xml",
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",
android/app/build/intermediates/blame/res/debug/multi-v2/values-v22.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-v22\\values-v22.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\396e7ddea1addefd32f4f3d87ec48909\\appcompat-1.1.0\\res\\values-v22\\values-v22.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-v23.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-v23\\values-v23.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\19593d9c2c700c52ad03572ebfd537d5\\material-1.1.0-rc02\\res\\values-v23\\values-v23.xml",
android/app/build/intermediates/blame/res/debug/multi-v2/values-v24.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-v24\\values-v24.xml",
=======
"outputFile": "C:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\firebaseBug\\gabinete-digital\\android\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
>>>>>>> origin/feature/pushNotifications
"map": [
{
"source": "C:\\Users\\tiago.kayaya\\.gradle\\caches\\transforms-2\\files-2.1\\47ce40ad459cbf22b0d81e337967e729\\media-1.0.0\\res\\values-v24\\values-v24.xml",

Some files were not shown because too many files have changed in this diff Show More