From 2ef34c8f678a160898f9b94f818424fe8a0f3153 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Mon, 20 Nov 2017 17:16:48 +0200
Subject: [PATCH] Merge branch 'master' of ssh://github.com/osmandapp/Osmand
 into new_edits_ui

# 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
---
 OsmAnd/res/layout/note_list_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/note_list_item.xml b/OsmAnd/res/layout/note_list_item.xml
index 55d874ade2..c0faa3a780 100644
--- a/OsmAnd/res/layout/note_list_item.xml
+++ b/OsmAnd/res/layout/note_list_item.xml
@@ -1,4 +1,4 @@
-?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"