Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

fix merge conflict

Ed Plato5df34d95d649
diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.js
index c6deda88f..52e5a363f 100644
--- a/web/js/containers/timeline/timeline.js
+++ b/web/js/containers/timeline/timeline.js
@@ -911,13 +911,8 @@ class Timeline extends React.Component {
let mobileLeft = 190;
let mobileBottom = 10;
if (isEmbedModeActive) {
-<<<<<<< HEAD
mobileLeft = 145;
mobileBottom = 10;
-=======
- mobileLeft = 143;
- mobileBottom = 4;
->>>>>>> 50add4b94 (adjust date mobile date arrow embed styling)
}
// positioning will change depending on a combination of:
// 1) subdaily (mobile date picker width);
@@ -932,13 +927,8 @@ class Timeline extends React.Component {
mobileLeft = isCompareModeActive ? 112 : 10;
mobileBottom = 65;
if (isEmbedModeActive) {
-<<<<<<< HEAD
mobileLeft = isCompareModeActive ? 80 : 10;
mobileBottom = 50;
-=======
- mobileLeft = isCompareModeActive ? 85 : 10;
- mobileBottom = 44;
->>>>>>> 50add4b94 (adjust date mobile date arrow embed styling)
}
}