fix merge conflict

audriga · Jun 17, 2024 · 063ea5b · 063ea5b
1 parent 1f256ac
commit 063ea5b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/tests/resources/README.md b/tests/resources/README.md
@@ -28,16 +28,6 @@
 
 * `cookbook-issue-rezeptwelt.html` - HTML pulled from rezeptwelt.de, which caused an issue in [nextcloud/cookbook](https://github.com/nextcloud/cookbook). See: https://github.com/nextcloud/cookbook/issues/1508.
 
-
-
-## Miscellaneous:
-
-* `website-without-markup.html` - https://www.example.com - html without any markup.
-
-* `mixed-jsonld-microdata.html` - A real world example of a website containing both JSON-LD tags, and Microdata, as well as having more than one JSON-LD tag. (Source: https://www.zeit.de/zeit-magazin/2023-06/schokolade-tonys-tafel-genuss)
-
-##  Related to other cookbook issues:
-
 * `resources/cookbook-issue-campbells.html` - HTML pulled from campbells.com, which caused an issue in [nextcloud/cookbook](https://github.com/nextcloud/cookbook). See: https://github.com/nextcloud/cookbook/issues/1647.
 
 * `resources/cookbook-issue-indian-recipie.html` - HTML pulled from vegrecipesofindia.com, which caused an issue in [nextcloud/cookbook](https://github.com/nextcloud/cookbook). See: https://github.com/nextcloud/cookbook/issues/1638.
@@ -50,4 +40,12 @@
 
 * `resources/cookbooks-issue-backerby-nature.html` - HTML pulled from bakerbynature.com, which caused an issue in [nextcloud/cookbook](https://github.com/nextcloud/cookbook). See: https://github.com/nextcloud/cookbook/issues/1639.
 
-* `resources/cookbooks-issue-holy-cow-vegan.html` - HTML pulled from holycowvegan.net, which caused an issue in [nextcloud/cookbook](https://github.com/nextcloud/cookbook). See: https://github.com/nextcloud/cookbook/issues/1637.
+* `resources/cookbooks-issue-holy-cow-vegan.html` - HTML pulled from holycowvegan.net, which caused an issue in [nextcloud/cookbook](https://github.com/nextcloud/cookbook). See: https://github.com/nextcloud/cookbook/issues/1637.
+
+## Miscellaneous:
+
+* `website-without-markup.html` - https://www.example.com - html without any markup.
+
+* `mixed-jsonld-microdata.html` - A real world example of a website containing both JSON-LD tags, and Microdata, as well as having more than one JSON-LD tag. (Source: https://www.zeit.de/zeit-magazin/2023-06/schokolade-tonys-tafel-genuss)
+
+
diff --git a/tests/resources/cookbook-issue-campbells.html b/tests/resources/cookbook-issue-campbells.html
@@ -8,8 +8,7 @@
     </script>
 
     <div class="js-header-search-form header-regular__search-form" id="header-regular__search-form" itemscope itemtype="http://schema.org/WebSite">
-        <div class="container">
-            <div class="search_form"></div>			</div>
+
     </div>