Fixed merge problem

doxygen · Dec 3, 2018 · c4b853d · c4b853d
1 parent df97d25
commit c4b853d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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: