From 8612d5b67e919173d1d631b971143817f0e1c122 Mon Sep 17 00:00:00 2001
From: Andrew Blackford <62357205+acblackford@users.noreply.github.com>
Date: Fri, 8 Sep 2023 14:00:57 -0500
Subject: [PATCH] swir formatting

---
 .../lahaina-hls-swir-falsecolor-composite.data.mdx | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/datasets/lahaina-hls-swir-falsecolor-composite.data.mdx b/datasets/lahaina-hls-swir-falsecolor-composite.data.mdx
index 9b4856d29..cdb4b6396 100644
--- a/datasets/lahaina-hls-swir-falsecolor-composite.data.mdx
+++ b/datasets/lahaina-hls-swir-falsecolor-composite.data.mdx
@@ -21,20 +21,6 @@ layers:
     zoomExtent:
       - 0
       - 20
-<<<<<<< HEAD
-    sourceParams:
-      post_process: swir
-      assets:
-        - B12
-        - B8A
-        - B04
-      bidx: 1
-      rescale:
-        - 0
-        - 255 
-=======
-
->>>>>>> ec2c6d65b249359eb04f5d60e882bf006e1b72ef
     compare:
       datasetId: lahaina-hls-swir-falsecolor-composite
       layerId: hls-swir-falsecolor-composite