search

MediaBrowser / Emby.Plugins

Plugins for Emby Server
http://emby.media
MIT License
99 stars 63 forks source link

Channel icon handling changed #128

Closed tolotos-rgu closed 8 years ago

LukePulverenti commented 8 years ago

Thanks. Unable to merge though due to conflicts.

tolotos-rgu commented 8 years ago

How can I resolve the conficts? I tried to "merge" the master into my fork but I don't know to do it right and it will not work.