From 143542e542d7d189dabf033b83e14d0e5f6920d1 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sat, 11 Aug 2018 21:59:49 +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
---
 .idea/caches/build_file_checksums.ser           | Bin 537 -> 537 bytes
 .../res/layout/activity_first_page_consent.xml  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index d2996312e6c4051cc88cf3b37c2dd75a300e8dba..5bd2d6b9ba07633a56db7f2058616446b2ef2900 100644
GIT binary patch
delta 14
WcmbQqGLvP(Oy-lBS2oV6Wdr~$y#_b{

delta 14
WcmbQqGLvP(Oy>4$A2-gaWdr~&4hDb#

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 44aacad..dc7663a 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="439dp"
+            android:layout_height="409dp"
             android:layout_marginBottom="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
-- 
GitLab