Merge branch 'drawer' of ssh://github.com/osmandapp/Osmand into drawer

Conflicts: OsmAnd/res/layout/drawer_list_item.xml
2014-10-26 01:01:10 +02:00 · 2014-10-26 01:01:10 +02:00 · ef0cae76cc
commit ef0cae76cc
parent 37cd9f0bb3 038d2369a9
1 changed files with 4 additions and 0 deletions
--- a/OsmAnd/res/layout/drawer_list_item.xml
+++ b/OsmAnd/res/layout/drawer_list_item.xml
@ -22,11 +22,15 @@
            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