Resolve conflicts

This commit is contained in:
MrTimscampi 2020-07-24 10:43:03 +02:00
parent 3713091382
commit 66b107f0c9
26 changed files with 91 additions and 410 deletions

View file

@ -1616,13 +1616,8 @@ import 'css!assets/css/videoosd';
if (browser.touch) {
(function () {
<<<<<<< HEAD
require(['touchHelper'], function (TouchHelper) {
self.touchHelper = new TouchHelper.default(view, {
=======
import('touchHelper').then(({default: TouchHelper}) => {
self.touchHelper = new TouchHelper(view, {
>>>>>>> upstream/master
swipeYThreshold: 30,
triggerOnMove: true,
preventDefaultOnMove: true,