fixed conflicts

Browse Source

...

This commit is contained in:

Nuno Coração

2024-03-19 23:57:43 +00:00

parent f03311be06 c5eef5a8f6

commit f7286ece55

39 changed files with 7852 additions and 652 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

exampleSite/content/docs/shortcodes/featured.svg

+1308 -24

File diff suppressed because one or more lines are too long

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 102 KiB

exampleSite/content/docs/shortcodes/old.svg

+24

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 27 KiB