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-checkbox/emby-checkbox.js
View file

@ -1,12 +1,7 @@
<<<<<<< HEAD
import browser from 'browser';
import dom from 'dom';
import 'css!./emby-checkbox';
import 'registerElement';
=======
define(['browser', 'dom', 'css!./emby-checkbox', 'webcomponents'], function (browser, dom) {
'use strict';
>>>>>>> upstream/master
import 'webcomponents';
/* eslint-disable indent */