From c7b0dacb28e3b5aa9f43a7a0eb683e2af9826cb9 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 9 May 2018 16:47:48 +0200
Subject: Do not bundle two different videojs versions

---
 client/package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'client/package.json')

diff --git a/client/package.json b/client/package.json
index f35386560..e9f84b593 100644
--- a/client/package.json
+++ b/client/package.json
@@ -21,6 +21,9 @@
     "webpack-bundle-analyzer": "webpack-bundle-analyzer"
   },
   "license": "GPLv3",
+  "resolutions": {
+    "videojs-dock/video.js": "^6"
+  },
   "devDependencies": {
     "@angular/animations": "~5.2.2",
     "@angular/cli": "1.7.4",
@@ -78,7 +81,7 @@
     "tslint-config-standard": "^7.0.0",
     "typescript": "2.8.1",
     "uglifyjs-webpack-plugin": "^1.1.2",
-    "video.js": "^6.7.3",
+    "video.js": "^6",
     "videojs-dock": "^2.0.2",
     "videojs-hotkeys": "^0.2.21",
     "webpack": "^4.5.0",
-- 
cgit v1.2.3