From eb5c085f744982663336431f95242eecbff39f8b Mon Sep 17 00:00:00 2001 From: Sivan Agranov <88330203+SivanA-Kaltura@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:13:05 +0200 Subject: [PATCH] Revert "chore: trigger custom canary build" Reverts kaltura/kaltura-player-js#893 --- package.json | 2 +- yarn.lock | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package.json b/package.json index e07e46f42..3f079d061 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@playkit-js/playkit-js-dash": "1.37.1", "@playkit-js/playkit-js-hls": "1.32.14-canary.0-976a05f", "@playkit-js/playkit-js-providers": "2.41.0", - "@playkit-js/playkit-js-ui": "0.79.17-canary.0-df9366b", + "@playkit-js/playkit-js-ui": "0.79.17-canary.0-098faf4", "hls.js": "^1.5.8", "shaka-player": "4.8.11" }, diff --git a/yarn.lock b/yarn.lock index 016a00d4b..483e01151 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1187,17 +1187,10 @@ resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-providers/-/playkit-js-providers-2.41.0.tgz#5ac4429527bee998ef9e9cc3c63073c1ba08e12a" integrity sha512-dmFsii8qTiDx5N72Zv9NNcdbJrcGeOgNSrTo9MiIcWGmfGTGyAw8ABuHL6CUC2HzdH1ZZFjApTyDYTzX+8UwLA== -<<<<<<< HEAD -"@playkit-js/playkit-js-ui@0.79.17-canary.0-df9366b": - version "0.79.17-canary.0-df9366b" - resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.79.17-canary.0-df9366b.tgz#46097f5f65791a185d27d51e90d4105cab410298" - integrity sha512-7gV12ggX7DFqLrtEbjCfb3LeKveU0AwwtgQsIa9w69O93BSRa+84ebPXu/vvr/UvEa4peHfmas7klkT9gHSXsw== -======= "@playkit-js/playkit-js-ui@0.79.17-canary.0-098faf4": version "0.79.17-canary.0-098faf4" resolved "https://registry.yarnpkg.com/@playkit-js/playkit-js-ui/-/playkit-js-ui-0.79.17-canary.0-098faf4.tgz#dd00272bb0597fd0d5ab3be5b5c29e77496478f1" integrity sha512-/6KHHHt9HEE/GlMTprdkbgf7i2psNPHw0kBSLoxE8GszkMYvq+e6AqAI34JEli7B1sjBaUL7sqBh8X+nVGb9lA== ->>>>>>> master dependencies: preact "10.4.6" preact-i18n "2.0.0-preactx.2"