Commit 41c18b67 authored by Ankita Tiwari's avatar Ankita Tiwari
Browse files

Merge branch 'top-secret' into 'master'

THE GRANT MERGE

See merge request ec327_projects/group7project!15
parents 98f99980 c1e9a70b
Loading
Loading
Loading
Loading

local.properties

0 → 100644
+17 −0
Original line number Diff line number Diff line
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Sat Apr 22 19:53:34 EDT 2023

# !!!!!!!!!!!!!!!!!!!!! WAIT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# don't delete other people's paths, just put a hashtag to comment it out and then uncomment or add yours ty :)
#sdk.dir=/home/elena/Android/Sdk
sdk.dir=/Users/prnv15/Library/Android/sdk
#sdk.dir=/Users/joharper/Library/Android/sdk
#sdk.dir=/Users/ankitatiwari1/Library/Android/sdk

>>>>>>>=fa0b39785e340f2e4603d94bdc597d48bc674390
<<<<<<<=HEAD
Loading