From 645c32e6c22e9d48852d531499031029baea3f66 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 26 Oct 2014 01:01:36 +0200 Subject: [PATCH] Fix merge --- OsmAnd/res/layout/drawer_list_item.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OsmAnd/res/layout/drawer_list_item.xml b/OsmAnd/res/layout/drawer_list_item.xml index 10d4a8a178..018fc14f55 100644 --- a/OsmAnd/res/layout/drawer_list_item.xml +++ b/OsmAnd/res/layout/drawer_list_item.xml @@ -22,15 +22,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp" -<<<<<<< HEAD android:layout_weight="1" android:layout_gravity="center_vertical" android:layout_marginBottom="8dp" android:layout_marginTop="8dp" android:layout_marginLeft="11dp" -======= - android:layout_marginBottom="13dp" ->>>>>>> 038d2369a927dadfc3ba9a7e9d812aee43f855d7 tools:text="Some title text" />