fixed yarn.lock conflict

2025-12-13 09:46:22 +00:00 · 2018-05-28 15:19:10 +07:00
parent 10500c3c1c ca0b03e97c
commit 172ea82954
19 changed files with 1332 additions and 1649 deletions
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -141,6 +141,7 @@ class Markdown {
      }
    })
    this.md.use(require('markdown-it-kbd'))
+    this.md.use(require('markdown-it-admonition'))

    const deflate = require('markdown-it-plantuml/lib/deflate')
    this.md.use(require('markdown-it-plantuml'), '', {