Commit 97764f79 authored by Ankita Tiwari's avatar Ankita Tiwari
Browse files

Merge remote-tracking branch 'origin/top-secret' into top-secret

parents 67458476 fc388d51

.gradle/file-system.probe

(8 B)

File changed.

No diff preview for this file type.

View original file
View changed file

app/src/main/res/layout/activity_leaderboard.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_marginTop="120dp"

        android:layout_marginBottom="30dp">

        android:layout_marginBottom="100dp">



        <LinearLayout

            android:layout_width="match_parent"

local.properties

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
# 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

sdk.dir=/Users/joharper/Library/Android/sdk

#sdk.dir=/Users/ankitatiwari1/Library/Android/sdk



>>>>>>>=fa0b39785e340f2e4603d94bdc597d48bc674390

<<<<<<<=HEAD