From 59f14a312bfa8c4650db2436187efa24495344bb Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sat, 11 Aug 2018 22:05:12 +0100
Subject: [PATCH] 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_bitmoji.xml
# app/src/main/res/layout/activity_third_page.xml
---
app/src/main/res/layout/activity_first_page_consent.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/activity_first_page_consent.xml b/app/src/main/res/layout/activity_first_page_consent.xml
index b5dcd7e..e5c7ac7 100644
--- a/app/src/main/res/layout/activity_first_page_consent.xml
+++ b/app/src/main/res/layout/activity_first_page_consent.xml
@@ -66,7 +66,7 @@
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
- android:layout_height="406dp"
+ android:layout_height="404dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
--
GitLab