fix conflicts

This commit is contained in:
jfh
2020-11-12 23:43:11 +01:00
20 changed files with 67 additions and 89 deletions

View File

@@ -316,8 +316,8 @@
</div>
<div id="text_panel">
<div class="toolset">
<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
<se-button id="tool_bold" title="Bold Text [B]" src="./images/bold.svg" shortcut="B"></se-button>
<se-button id="tool_italic" title="Italic Text [I]" src="./images/italic.svg" shortcut="I"></se-button>
</div>
<div class="toolset" id="tool_font_family">
<label>