diff --git a/src/components/Icon/index.tsx b/src/components/Icon/index.tsx index 1d2d54042d4c..59b1639dce33 100644 --- a/src/components/Icon/index.tsx +++ b/src/components/Icon/index.tsx @@ -102,12 +102,6 @@ class Icon extends PureComponent { } } -<<<<<<< HEAD -Icon.displayName = 'Icon'; - -export default Icon; -======= export type {SrcProps}; export default withTheme(withThemeStyles(withStyleUtils(Icon))); ->>>>>>> 9a936b1 (Merge pull request #33325 from rayane-djouah/Revert-"Migrate-Icon/index.js-and-FloatingActionButton-to-function-component")