Skip to content

Commit 063ea5b

Browse files
committed
fix merge conflict
1 parent 1f256ac commit 063ea5b

File tree

3 files changed

+11
-36
lines changed

3 files changed

+11
-36
lines changed

tests/resources/README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@
2828

2929
* `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.
3030

31-
32-
33-
## Miscellaneous:
34-
35-
* `website-without-markup.html` - https://www.example.com - html without any markup.
36-
37-
* `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)
38-
39-
## Related to other cookbook issues:
40-
4131
* `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.
4232

4333
* `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 @@
5040

5141
* `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.
5242

53-
* `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.
43+
* `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.
44+
45+
## Miscellaneous:
46+
47+
* `website-without-markup.html` - https://www.example.com - html without any markup.
48+
49+
* `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)
50+
51+

tests/resources/cookbook-issue-campbells.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
</script>
99

1010
<div class="js-header-search-form header-regular__search-form" id="header-regular__search-form" itemscope itemtype="http://schema.org/WebSite">
11-
<div class="container">
12-
<div class="search_form"></div> </div>
11+
1312
</div>
1413

1514

0 commit comments

Comments
 (0)