Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
# Conflicts:
#	OsmAnd/res/layout/list_item_header.xml
#	OsmAnd/res/layout/note_list_item.xml
#	OsmAnd/res/layout/update_index.xml
#	OsmAnd/res/values/strings.xml
This commit is contained in:
PavelRatushny 2017-11-20 17:16:48 +02:00
parent 9b852ca8a7
commit 2ef34c8f67
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/note_list_item.xml
View file

@ -1,4 +1,4 @@
?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"