From c4b853d749fcaffb2f2c142dcd14e48ab049013e Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 3 Dec 2018 23:20:31 +0100
Subject: Fixed merge problem

---
 src/htmldocvisitor.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index e679445..4555fe4 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -658,12 +658,11 @@ void HtmlDocVisitor::visit(DocInclude *inc)
       break;
     case DocInclude::DontInclude: 
       break;
-    case DocInclude::HtmlInclude: 
+    case DocInclude::HtmlInclude:
       {
-        bool forced = false;
-        if (inc->isBlock()) forced  = forceEndParagraph(inc);
+        if (inc->isBlock()) forceEndParagraph(inc);
         m_t << inc->text();
-        if (inc->isBlock()) forceStartParagraph(inc, forced);
+        if (inc->isBlock()) forceStartParagraph(inc);
       }
       break;
     case DocInclude::LatexInclude:
-- 
cgit v0.12