Skip to content

armgit / bento

Public Imported from GitHub
0

Bento, the office suite that fits in a file

Fix leftover CHANGELOG conflict marker

nyblnetf3a7b0901c8b
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f3b2011..48b2ab77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,6 @@ pre-1.0.
selection, connectors, comments and live-collab node identity are untouched —
and the default morph (elements sharing an `id`) is unchanged, so existing
decks behave identically. Same-slide key collisions are rejected inline.
->>>>>>> main
- **True bezier curve editing.** Selecting a curve now shows real pen-tool
control handles (in/out tangents) on each anchor — drag a handle to bend the