remove diff reconcile text

8d4ccf37 · Snyder, Amelia Marie · 5953a44d · 8d4ccf37
Commit 8d4ccf37 authored 11 months ago by Snyder, Amelia Marie
--- a/catalog/catalog.json
+++ b/catalog/catalog.json
@@ -317,7 +317,6 @@
    {
      "rel": "child",
      "href": "./cprep/collection.json",
->>>>>>> catalog/catalog.json
      "type": "application/json"
    }
  ]