Merge pull request #379 from IIIF/fix-merge-artifact

Fix merge artifact and layout consequences
IIIF · Jan 27, 2023 · 5e76f8d · 5e76f8d
2 parents c352189 + 88730cd
commit 5e76f8d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/_includes/links.md b/_includes/links.md
@@ -20,7 +20,6 @@
 [0139]: {{ site.cookbook_url | absolute_url }}/recipe/0139-geolocate-canvas-fragment/ "Represent Canvas Fragment as a Geographic Area on a Web Map"
 
 [0019]: {{ site.cookbook_url | absolute_url }}/recipe/0019-html-in-annotations/ "HTML in Annotations"
->>>>>>> master
 [0021]: {{ site.cookbook_url | absolute_url }}/recipe/0021-tagging/ "Simple Annotation — Tagging"
 
 [0033]: {{site.baseurl}}/recipe/0033-choice/ "Multiple choice of images in a single view"