changed

JiaHua-Zou · Sep 29, 2021 · 889cd1d · 889cd1d
2 parents e23c4f7 + c062897
commit 889cd1d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/fs-Handler.js b/fs-Handler.js
@@ -92,7 +92,12 @@ function htmlConverter(src, fileDirName, isMarkDown = false, lang) {
     title = title[0].trim();
     text = src.substring(fileName.length + 3);
   }
+<<<<<<< HEAD
 
+=======
+//aa
+  let htmlElement = "";
+>>>>>>> issue-16
   if (!isMarkDown) {
     htmlElement = text
       .split(/\r?\n\r?\n/)