Commit 7c277e57 authored by Pranav Shrihari's avatar Pranav Shrihari
Browse files

Name change

parent d6cc2206

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
        android:layout_marginTop="50dp"

        android:layout_marginEnd="337dp"

        android:layout_marginBottom="25dp"

        android:text="7 nights at EC327"

        android:text="EC327 Simulator"

        android:textColor="@android:color/holo_blue_dark"

        android:textSize="30sp"

        android:textStyle="bold"

local.properties

+5 −7
Original line number Diff line number Diff line
@@ -4,10 +4,8 @@ 
# 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
 
#Sat Apr 22 19:53:34 EDT 2023

=\=\=\=\=\=\=

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

>>>>>>>=fa0b39785e340f2e4603d94bdc597d48bc674390

<<<<<<<=HEAD