docs: update changeNotes.html

liying2008 · Dec 2, 2023 · 4078eee · 4078eee
1 parent b07c671
commit 4078eee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changeNotes.html b/changeNotes.html
@@ -1,3 +1,9 @@
+<h3>v2.0.0</h3><br>
+<li>Support diff3 style conflict markers.</li>
+<li>Fix an issue where there is an extra blank line in individual cases when resolving conflicts.</li>
+<em>Please note: Using this version will lose the previous configuration of the "Git Conflict" plugin. This is because the new configuration is no longer compatible with the old version.</em>
+<br>
+
 <h3>v1.0.5</h3><br>
 <li>Fix compatibility errors.</li>
 <br>

diff --git a/example/settings-panel.png b/example/settings-panel.png