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

8
src/elements/emby-collapse/emby-collapse.js
View file

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