Merge

android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 #Mon Feb 08 16:43:37 WAT 2021
+=======
+#Mon Feb 08 13:20:10 WAT 2021
+>>>>>>> feature/calendar
 path.3=classes_1.dex
 path.2=classes_0.dex
 path.1=classes.dex
@@ -7,7 +11,7 @@ renamed.3=classes4.dex
 renamed.2=classes3.dex
 renamed.1=classes2.dex
 renamed.0=classes.dex
-base.3=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_1.dex
-base.2=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_0.dex
-base.1=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\classes.dex
-base.0=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+base.3=/home/rmx/Documents/gabinete-digital/repo/gabinete-digital/android/app/build/intermediates/dex/debug/mergeLibDexDebug/out/classes_1.dex
+base.2=/home/rmx/Documents/gabinete-digital/repo/gabinete-digital/android/app/build/intermediates/dex/debug/mergeLibDexDebug/out/classes_0.dex
+base.1=/home/rmx/Documents/gabinete-digital/repo/gabinete-digital/android/app/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
+base.0=/home/rmx/Documents/gabinete-digital/repo/gabinete-digital/android/app/build/intermediates/dex/debug/mergeExtDexDebug/out/classes.dex