Skip to content

Build your personal knowledge base with Trilium Notes

Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/board-improvements-18

Adorian Doranf82af60d97aa
diff --cc apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Insert buttons.html
index 0468351a1f,e28cf27695..43ca48c34b
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Insert buttons.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Insert buttons.html
@@@ -49,11 -49,10 +49,18 @@@ src="1_Insert buttons_plus.png" width="
</figure>
<h2>Horizontal ruler</h2>
<p>This feature will display a horizontal line, generally useful to separate
++<<<<<<< HEAD
+ different sections of the text. To do so, press the
+ <img src="5_Insert buttons_image.png"
+ width="18" height="16">button in the&nbsp;<a class="reference-link" href="#root/_help_nRhnJkTT8cPs">Formatting toolbar</a>.</p>
+<img
+src="3_Insert buttons_image.png" width="502" height="95">
++=======
+ different sections of the text. To do so, press the&nbsp;<span class="tn-icon cke cke-horizontal-line"></span> button
+ in the&nbsp;<a class="reference-link" href="#root/_help_nRhnJkTT8cPs">Formatting toolbar</a>.</p>
+ <img
+ src="1_Insert buttons_image.png" width="502" height="95">
++>>>>>>> b0069685a3479d62e9d1a1165cf05df724affcc9
<p>Alternatively, it's possible to insert a horizontal ruler by typing <code>---</code>.</p>
<h2>Page break</h2>
<figure class="image image-style-align-right">