From 0bc700cf8e99a2da32be71ea3e50fefc19ee0718 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 9 Feb 2017 15:01:56 +0100
Subject: [PATCH] Handle NELF placeholder for mimetype text/html

---
 api/src/Storage/Merge.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 2259592dfb..ab459f8582 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1506,6 +1506,9 @@ abstract class Merge
 				case 'application/xml';
 					$LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
 					break;
+				case 'text/html':
+					$LF = "<br/>";
+					break;
 				default:
 					$LF = "\n";
 			}