From 2f70e3e1500de593e43c17fee7e83049838fb866 Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 11:15:37 +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_consent.xml
---
.idea/misc.xml | 2 +-
app/src/main/res/layout/what_is_chatbot.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..99202cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/src/main/res/layout/what_is_chatbot.xml b/app/src/main/res/layout/what_is_chatbot.xml
index df65071..d149f5f 100644
--- a/app/src/main/res/layout/what_is_chatbot.xml
+++ b/app/src/main/res/layout/what_is_chatbot.xml
@@ -133,7 +133,7 @@
<ImageView
android:id="@+id/imageView5"
android:layout_width="100dp"
- android:layout_height="10dp"
+ android:layout_height="100dp"
android:layout_marginEnd="260dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
--
GitLab