Skip to content

Commit

Permalink
fix: bad merge conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
adixon-adobe authored and Westbrook committed Mar 9, 2021
1 parent fa66d56 commit e408d61
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/picker/src/Picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import chevronStyles from '@spectrum-web-components/icon/src/spectrum-icon-chevr

import { Focusable } from '@spectrum-web-components/shared/src/focusable.js';
import { reparentChildren } from '@spectrum-web-components/shared/src/reparent-children.js';
import '@spectrum-web-components/icon/sp-icon.js';
import '@spectrum-web-components/icons-ui/icons/sp-icon-chevron100.js';
import '@spectrum-web-components/icons-workflow/icons/sp-icon-alert.js';
import '@spectrum-web-components/menu/sp-menu.js';
import {
Expand Down

0 comments on commit e408d61

Please sign in to comment.