Skip to content
Snippets Groups Projects
Commit ccb17036 authored by George Muresan's avatar George Muresan
Browse files

Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/res/layout/activity_first_page_consent.xml
parent 9754a7d3
No related branches found
No related tags found
No related merge requests found
...@@ -107,13 +107,13 @@ ...@@ -107,13 +107,13 @@
android:id="@+id/submitButton" android:id="@+id/submitButton"
android:layout_width="102dp" android:layout_width="102dp"
android:layout_height="43dp" android:layout_height="43dp"
android:layout_marginBottom="14dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:text="@string/submitUpdate" android:text="@string/submitUpdate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/yourName2" />
<EditText <EditText
......
...@@ -108,13 +108,13 @@ ...@@ -108,13 +108,13 @@
android:id="@+id/submitButton" android:id="@+id/submitButton"
android:layout_width="102dp" android:layout_width="102dp"
android:layout_height="43dp" android:layout_height="43dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:text="@string/submitUpdate" android:text="@string/submitUpdate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/yourName2" />
<EditText <EditText
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment