Loading .gradle/7.5/fileHashes/fileHashes.bin +100 B (243 KiB) File changed.No diff preview for this file type. View original file View changed file .gradle/7.5/fileHashes/fileHashes.lock (17 B) File changed.No diff preview for this file type. View original file View changed file local.properties +4 −7 Original line number Diff line number Diff line Loading @@ -4,10 +4,7 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. <<<<<<< HEAD #Sat Apr 22 14:41:55 EDT 2023 sdk.dir=/home/elena/Android/Sdk ======= #Sat Apr 22 18:52:08 EDT 2023 sdk.dir=/Users/ankitatiwari1/Library/Android/sdk >>>>>>> fa0b39785e340f2e4603d94bdc597d48bc674390 #Sun Apr 23 12:37:19 EDT 2023 sdk.dir=C\:\\Users\\ethan\\AppData\\Local\\Android\\Sdk Loading
.gradle/7.5/fileHashes/fileHashes.bin +100 B (243 KiB) File changed.No diff preview for this file type. View original file View changed file
.gradle/7.5/fileHashes/fileHashes.lock (17 B) File changed.No diff preview for this file type. View original file View changed file
local.properties +4 −7 Original line number Diff line number Diff line Loading @@ -4,10 +4,7 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. <<<<<<< HEAD #Sat Apr 22 14:41:55 EDT 2023 sdk.dir=/home/elena/Android/Sdk ======= #Sat Apr 22 18:52:08 EDT 2023 sdk.dir=/Users/ankitatiwari1/Library/Android/sdk >>>>>>> fa0b39785e340f2e4603d94bdc597d48bc674390 #Sun Apr 23 12:37:19 EDT 2023 sdk.dir=C\:\\Users\\ethan\\AppData\\Local\\Android\\Sdk
