Fix merge

2014-10-26 01:01:36 +02:00 · 2014-10-26 01:01:36 +02:00 · 645c32e6c2
commit 645c32e6c2
parent ef0cae76cc
1 changed files with 0 additions and 4 deletions
--- 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" />

    <CheckBox