From 0ee85620c33d687aad4a3985e84546ed649bc2ed Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Sun, 7 May 2017 19:32:49 +0200
Subject: [PATCH] Update README.md

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9418b83..8449d50 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
 # Repository holding the sources of the KWARC.info website
 
-** Note for authors: When editing some text, please do not hard wrap existing lines. 
-This plays very bad with diffs, in particular an entire paragraph shows up as changed even though it might just be a single paragraph. 
+<b>
+Note for authors: When editing some text, please do not hard wrap existing lines. 
+This plays very bad with diffs, in particular an entire paragraph shows up as changed even though it might just be a single line. 
+Furthermore, this introduces lots and lots of merge conflicts
 Markdown (similar to TeX) only inserts actual line breaks when making to link breaks in the source file. 
 Thus the most readable and diff-compatible option is to write one sentence per line and use soft-wrapping on top in editors. 
 This is called [semantic linefeeds](http://rhodesmill.org/brandon/2012/one-sentence-per-line/). 
-**
+</b>
 
 ## About
 
-- 
GitLab