mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 13:53:54 +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 12:28:39 +02:00
parent 43a707dad5
commit 7629e00f33
4 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/layout_upload_item.xml
View file

@ -13,13 +13,10 @@
android:id="@+id/uploadImage"
android:layout_width="match_parent"
android:layout_height="192dp"
<<<<<<< HEAD
app:actualImageScaleType="centerCrop"
app:placeholderImage="@drawable/ic_image_black_24dp"
app:failureImage="@drawable/ic_error_outline_black_24dp"
=======
android:scaleType="centerCrop"
>>>>>>> origin/fix_lint_issues
android:contentDescription="@string/upload_image"
/>