Skip to content
Snippets Groups Projects
Commit 8d4ccf37 authored by Snyder, Amelia Marie's avatar Snyder, Amelia Marie
Browse files

remove diff reconcile text

parent 5953a44d
No related branches found
No related tags found
1 merge request!72add serap workflows
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
catalog/catalog.json
+ 0
− 1
View file @ 8d4ccf37
...@@ -317,7 +317,6 @@ ...@@ -317,7 +317,6 @@
{ {
"rel": "child", "rel": "child",
"href": "./cprep/collection.json", "href": "./cprep/collection.json",
>>>>>>> catalog/catalog.json
"type": "application/json" "type": "application/json"
} }
] ]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment