Merge branch 'fix-udp-description' of github.com-vito:ESA-APEx/apex_a…

…lgorithms into fix-udp-description
ESA-APEx · Nov 8, 2024 · 1830ed9 · 1830ed9
2 parents c42cd85 + 083defa
commit 1830ed9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/algorithm_catalog/bap_composite.json b/algorithm_catalog/bap_composite.json
@@ -81,11 +81,7 @@
       "rel": "openeo-process",
       "type": "application/json",
       "title": "openEO Process Definition",
-<<<<<<< HEAD
       "href": "https://raw.githubusercontent.com/ESA-APEx/apex_algorithms/refs/heads/main/openeo_udp/bap_composite.json"
-=======
-      "href": "https://raw.githubusercontent.com/ESA-APEx/apex_algorithms/main/openeo_udp/bap_composite.json"
->>>>>>> 083defa (fix: update UDPs description and replace broken image links with raw github links)
     },
     {
       "rel": "service",