fix merge conflicts

Browse source

...

This commit is contained in:

Luke Pulverenti 2017-08-27 13:34:42 -04:00

parent e3062aad8e

commit b7b02d037e

5 changed files with 6 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored

View file

File diff suppressed because one or more lines are too long

2

dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored

View file

File diff suppressed because one or more lines are too long

2

dashboard-ui/bower_components/emby-webcomponents/homesections/homesections.js vendored

View file

File diff suppressed because one or more lines are too long

4

dashboard-ui/scripts/itemdetailpage.js

View file

File diff suppressed because one or more lines are too long

2

dashboard-ui/scripts/livetvsuggested.js

View file

File diff suppressed because one or more lines are too long