mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-28 21:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
Dinu Kumarasiri 2017-05-20 11:58:26 +02:00
commit 43a707dad5
4 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/res/layout/activity_share.xml
View file

@ -7,7 +7,14 @@
<RelativeLayout
android:layout_width="match_parent"
<<<<<<< HEAD
android:layout_height="match_parent">
=======
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:contentDescription="@string/background_image"
/>
>>>>>>> origin/fix_lint_issues
<include
android:id="@+id/toolbar"