mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

merge with develop branch

Browse source
This commit is contained in:
ilmar 2018-05-21 15:41:49 +03:00
commit 4feccff530
6 changed files with 291 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/utils/ExportHtml.js
View file

@ -371,7 +371,11 @@ function getHTMLFromAtext(pad, atext, authorColors)
if (!exists) {
var prevLevel = 0;
if (prevLine && prevLine.listLevel) {
<<<<<<< HEAD
prevLevel = prevLine.listLevel;
=======
prevlevel = prevLine.listLevel;
>>>>>>> develop
}
if (prevLine && line.listTypeName !== prevLine.listTypeName)
{