Remove git artifacts

0211926f · Lyza Danger Gardner · Lyza Gardner · aa316c6e · 0211926f
Commit 0211926f authored Sep 06, 2022 by Lyza Danger Gardner Committed by Lyza Gardner Sep 08, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

AdderToolbar.tsx src/annotator/components/AdderToolbar.tsx +0 -3

No files found.
--- a/src/annotator/components/AdderToolbar.tsx
+++ b/src/annotator/components/AdderToolbar.tsx
@@ -126,9 +126,7 @@ type AdderToolbarProps = {
 * The toolbar that is displayed above or below selected text in the document,
 * providing options to create annotations or highlights.
 *
-<<<<<<< HEAD:src/annotator/components/AdderToolbar.js
 * @param {AdderToolbarProps} props
-=======
 * The toolbar has nuanced styling for hover. The component structure is:
 *
 * <AdderToolbar>
@@ -159,7 +157,6 @@ type AdderToolbarProps = {
 *   badge will darken when its parent button is hovered, even if it is not
 *   hovered directly.
 *
->>>>>>> 544c8e5c6 (Convert `AdderToolbar` to TypeScript):src/annotator/components/AdderToolbar.tsx
 */
 export default function AdderToolbar({
  arrowDirection,