Update vibe-3-changelog.md

mondaycom · Jun 26, 2024 · 704bc0a · 704bc0a
1 parent af37170
commit 704bc0a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/core/docs/vibe-3-changelog.md b/packages/core/docs/vibe-3-changelog.md
@@ -7,12 +7,9 @@
 - Change hideDelay default to be 100
 - Change position prop to accept string instead of static prop
 - Change position prop to only accept "top, right, bottom, left"
-<<<<<<< Breaking-Tooltip---remove-justify-prop-6890236950
 - Remove justify prop
-=======
 - Remove arrowPosition prop
 - Remove TooltipArrowPosition enum
->>>>>>> tooltip
 
 ## Tipseen
 - Change showDelay default to 100