diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-03 22:20:31 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-03 22:20:31 (GMT) |
| commit | c4b853d749fcaffb2f2c142dcd14e48ab049013e (patch) | |
| tree | 5f012c4fa9b4279f00fdb90b7d59752848ee5c4e /src | |
| parent | df97d25bb07506723627757d6af7aa6dc7aea4dd (diff) | |
| download | Doxygen-c4b853d749fcaffb2f2c142dcd14e48ab049013e.zip Doxygen-c4b853d749fcaffb2f2c142dcd14e48ab049013e.tar.gz Doxygen-c4b853d749fcaffb2f2c142dcd14e48ab049013e.tar.bz2 | |
Fixed merge problem
Diffstat (limited to 'src')
| -rw-r--r-- | src/htmldocvisitor.cpp | 7 |
1 files 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: |