milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve conflicts

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
src/elements/emby-slider/emby-slider.js
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
import browser from 'browser';
import dom from 'dom';
import layoutManager from 'layoutManager';
@ -6,10 +5,6 @@ import keyboardnavigation from 'keyboardnavigation';
import 'css!./emby-slider';
import 'webcomponents';
import 'emby-input';
=======
define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-slider', 'webcomponents', 'emby-input'], function (browser, dom, layoutManager, keyboardnavigation) {
'use strict';
>>>>>>> upstream/master
/* eslint-disable indent */