fixing one more conflict markers

taver-ca · Jun 22, 2024 · 7af115e · 7af115e
1 parent 1d1dad0
commit 7af115e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/BaseInput.js b/src/BaseInput.js
@@ -11,11 +11,6 @@ const mapStyles = [
   { mapId: "53a5c2c14f51f10b", displayName: "Dark Theme", buttonColorCss: "#404040" },
 ];
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> fixing_optimization
 function getTotalDistance(concerts, userLocation) {
 
   if (concerts.length <= 0) {