fix broken merge stuff

Trustroots · Nov 21, 2024 · 0c6db22 · 0c6db22
1 parent 7f6768a
commit 0c6db22
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/nr-app/src/components/Map.tsx b/nr-app/src/components/Map.tsx
@@ -15,9 +15,7 @@ import MapView, { Callout, LatLng, Marker } from "react-native-maps";
 import { setVisiblePlusCodes } from "@/redux/actions/map.actions";
 import React, { useState } from "react";
 import { Button, Modal, TextInput } from "react-native";
-<<<<<<< HEAD
 import { getFirstTagValueFromEvent } from "@/common/utils";
-=======
 
 // todo: make it more typescriptsy
 function extractLocationCode(data: any) {
@@ -30,7 +28,6 @@ function extractLocationCode(data: any) {
   }
   return null;
 }
->>>>>>> 2b75bee (adding hitchmap switch to ux, not functional yet)
 
 const NoteMarker = ({ event }: { event: EventWithMetadata }) => {
   const plusCode = getFirstTagValueFromEvent(event.event, "open-location-code");