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

@ -1,16 +1,10 @@
<<<<<<< HEAD
import dom from 'dom';
import scroller from 'scroller';
import browser from 'browser';
import layoutManager from 'layoutManager';
import focusManager from 'focusManager';
import 'registerElement';
import 'webcomponents';
import 'css!./emby-tabs';
import 'scrollStyles';
=======
define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'webcomponents', 'css!./emby-tabs', 'scrollStyles'], function (dom, scroller, browser, layoutManager, focusManager) {
'use strict';
>>>>>>> upstream/master
/* eslint-disable indent */