From 21028c1a0564d9f7e507d16ca28ec7c85d725a10 Mon Sep 17 00:00:00 2001
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Thu, 23 Jan 2020 19:58:32 +0000
Subject: [PATCH] Replace spaces with tabs.  Visible change.

---
 .../books/handbook/introduction/chapter.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
index 5815f518c1..8d01e4c591 100644
--- a/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/introduction/chapter.xml
@@ -342,13 +342,13 @@
 	Webseiten, die unter &os; laufen, gehören
 	<link xlink:href="https://news.ycombinator.com/">Hacker News</link>,
 	<link xlink:href="http://www.netcraft.com/">Netcraft</link>,
->>>>>>>><link xlink:href="http://www.163.com/">NetEase</link>,
->>>>>>>><link xlink:href="https://signup.netflix.com/openconnect">Netflix</link>,
->>>>>>>><link xlink:href="http://www.sina.com/">Sina</link>,
->>>>>>>><link xlink:href="http://www.sony.co.jp/">Sony Japan</link>,
->>>>>>>><link xlink:href="http://www.rambler.ru/">Rambler</link>,
->>>>>>>><link xlink:href="http://www.yahoo.com/">Yahoo!</link>, und
->>>>>>>><link xlink:href="http://www.yandex.ru/">Yandex</link>.</para>
+	<link xlink:href="http://www.163.com/">NetEase</link>,
+	<link xlink:href="https://signup.netflix.com/openconnect">Netflix</link>,
+	<link xlink:href="http://www.sina.com/">Sina</link>,
+	<link xlink:href="http://www.sony.co.jp/">Sony Japan</link>,
+	<link xlink:href="http://www.rambler.ru/">Rambler</link>,
+	<link xlink:href="http://www.yahoo.com/">Yahoo!</link>, und
+	<link xlink:href="http://www.yandex.ru/">Yandex</link>.</para>
 
       <para>&os;s fortgeschrittene Eigenschaften, bewährte Sicherheit
 	und vorhersehbare Release-Zyklen, genauso wie seine tolerante