merge pain

Amsterdam · Jul 17, 2024 · cf28986 · cf28986
2 parents da5088e + 1d4da4f
commit cf28986
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/pages/Marker/Marker.tsx b/src/pages/Marker/Marker.tsx
@@ -4,7 +4,7 @@ import getCrsRd from '@/utils/getCrsRd';
 import styles from './styles.module.css';
 import customMarker from './icons/customMarker';
 
-const Marker = () => {
+const Marker1 = () => {
   const containerRef = useRef<HTMLDivElement>(null);
   const [mapInstance, setMapInstance] = useState<L.Map | null>(null);
   const [, setMarkerInstance] = useState<L.Marker | null>(null);
@@ -63,4 +63,4 @@ const Marker = () => {
   return <div className={styles.container} ref={containerRef} />;
 };
 
-export default Marker;
+export default Marker1;
diff --git a/src/stories/Icons.mdx b/src/stories/Icons.mdx
@@ -1,8 +1,14 @@
 import { Meta } from "@storybook/blocks";
 
+<<<<<<< HEAD
 <Meta title="Leaflet - Icons" />
 
 # Leaflet - Icons
+=======
+<Meta title="Icons" />
+
+# Icons
+>>>>>>> main
 
 ## In short