From 8d4ccf37d999a9f10c6b5905ba6289affa36fc31 Mon Sep 17 00:00:00 2001
From: amsnyder <asnyder@usgs.gov>
Date: Tue, 9 Apr 2024 16:08:42 -0500
Subject: [PATCH] remove diff reconcile text
---
catalog/catalog.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/catalog/catalog.json b/catalog/catalog.json
index 0cd440b2..12dade73 100644
--- a/catalog/catalog.json
+++ b/catalog/catalog.json
@@ -317,7 +317,6 @@
{
"rel": "child",
"href": "./cprep/collection.json",
->>>>>>> catalog/catalog.json
"type": "application/json"
}
]
--
GitLab