Skip to content
Snippets Groups Projects
Commit 43ae5718 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 204201c9
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="526dp" android:layout_height="556dp"
tools:layout_editor_absoluteX="8dp" tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="0dp"> tools:layout_editor_absoluteY="0dp">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment