mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code 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

7
src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
View file

@ -1,15 +1,10 @@
<<<<<<< HEAD
import EmbyProgressRing from 'emby-progressring';
import dom from 'dom';
import serverNotifications from 'serverNotifications';
import events from 'events';
import 'registerElement';
import 'webcomponents';
/* eslint-disable indent */
=======
define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'webcomponents'], function (EmbyProgressRing, dom, serverNotifications, events) {
'use strict';
>>>>>>> upstream/master
function addNotificationEvent(instance, name, handler) {