Merge pull request #41 from TiagoM13/refactor/components

resolve conflict
TiagoM13 · May 14, 2023 · 0fe866d · 0fe866d
2 parents 8803233 + 3a4f027
commit 0fe866d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/src/components/Loading/Loading.tsx b/src/components/Loading/Loading.tsx
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -6,11 +6,11 @@ export * from './Header/Header';
 export * from './ImageLazyLoader/ImageLazyLoader';
 export * from './InputSearch/InputSearch';
 export * from './ListPokemon/ListPokemon';
-export * from './Loading/Loading';
-export * from './LoadingSkeleton/CardLoadingSkeleton';
 export * from './Modal/Modal';
 export * from './PokemonCard/PokemonCard';
 export * from './Separator/Separator';
 export * from './ShowMoreButton/ShowMoreButton';
 export * from './SocialMedia/SocialMedia';
 export * from './TypeCard/TypeCard';
+export * from './ImageLazyLoader/ImageLazyLoader';
+export * from './LoadingSkeleton/CardLoadingSkeleton';