diff --git a/doc/layouts/partials/head/head.html b/doc/layouts/partials/head/head.html index 78ecd4ff8..8ab4af528 100644 --- a/doc/layouts/partials/head/head.html +++ b/doc/layouts/partials/head/head.html @@ -45,7 +45,11 @@ {{- end }} +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes {{ template "_internal/opengraph.html" . }} diff --git a/doc/package.json b/doc/package.json index f2d0cc4ca..be430d7a6 100644 --- a/doc/package.json +++ b/doc/package.json @@ -4,7 +4,11 @@ "private": true, "description": "Hugo Theme for The Things Stack", "dependencies": { +<<<<<<< Updated upstream "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.5.0.tar.gz", +======= + "@tti/design": "https://ttui.thethingsindustries.com/release/ttui-1.7.4.tar.gz", +>>>>>>> Stashed changes "bulma": "^0.9.1" }, "devDependencies": {} diff --git a/doc/yarn.lock b/doc/yarn.lock index 95d230e12..ba246c414 100644 --- a/doc/yarn.lock +++ b/doc/yarn.lock @@ -2,9 +2,15 @@ # yarn lockfile v1 +<<<<<<< Updated upstream "@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.5.0.tar.gz": version "0.0.0" resolved "https://ttui.thethingsindustries.com/release/ttui-1.5.0.tar.gz#1ccdbe9ce80cf3272c935189a96095676e23b54a" +======= +"@tti/design@https://ttui.thethingsindustries.com/release/ttui-1.7.4.tar.gz": + version "0.0.0" + resolved "https://ttui.thethingsindustries.com/release/ttui-1.7.4.tar.gz#03bddf2d0cc548d977ba7b4a2fb7c6876bd3b939" +>>>>>>> Stashed changes bulma@^0.9.1: version "0.9.4"