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

6
src/elements/emby-progressring/emby-progressring.js
View file

@ -1,11 +1,5 @@
<<<<<<< HEAD
import require from 'require';
import 'css!./emby-progressring';
import 'webcomponents';
=======
define(['require', 'css!./emby-progressring', 'webcomponents'], function (require) {
'use strict';
>>>>>>> upstream/master
/* eslint-disable indent */