mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 05:43:55 +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

9
app/src/main/res/layout/activity_about.xml
View file

@ -4,9 +4,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<<<<<<< HEAD
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
=======
<ImageView
android:src="@drawable/ic_launcher"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:contentDescription= "@string/commons_logo"
/>
>>>>>>> origin/fix_lint_issues
<include
android:id="@+id/toolbar"