Skip to content

Commit 07c9ad0

Browse files
committed
fix bad merge
1 parent 485aa2c commit 07c9ad0

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

docs/content/drafts/ActionMenu2.mdx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,7 @@ You can choose to have a different _anchor_ for the Menu dependending on the app
182182

183183
To create an anchor outside of the menu, you need to switch to controlled mode for the menu and pass it as `anchorRef` to `ActionMenu`. Make sure you add `aria-expanded` and `aria-haspopup` to the external anchor:
184184

185-
<<<<<<< HEAD
186-
187-
````javascript live noinline drafts
188-
=======
189-
```javascript live noinline
190-
// import {ActionMenu, ActionList} from '@primer/react/drafts'
191-
const {ActionMenu, ActionList, Button} = drafts // ignore docs silliness; import like that
192-
193-
>>>>>>> main
185+
```javascript live noinline drafts
194186
const Example = () => {
195187
const [open, setOpen] = React.useState(false)
196188
const anchorRef = React.createRef()
@@ -217,7 +209,7 @@ const Example = () => {
217209
}
218210

219211
render(<Example />)
220-
````
212+
```
221213

222214
### With Overlay Props
223215

0 commit comments

Comments
 (0)