mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 20:08:59 +02:00
fix merge conflicts
This commit is contained in:
parent
ef8eece6d4
commit
c74acaae59
3 changed files with 0 additions and 106 deletions
|
@ -1,32 +0,0 @@
|
|||
{
|
||||
"version": 2,
|
||||
"exports": {
|
||||
"MediaBrowser.Common/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Common.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Common.dll": {}
|
||||
}
|
||||
},
|
||||
"MediaBrowser.Model/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Model.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Model.dll": {}
|
||||
},
|
||||
"contentFiles": {
|
||||
"bin/Release/MediaBrowser.Model.pdb": {
|
||||
"buildAction": "None",
|
||||
"codeLanguage": "any",
|
||||
"copyToOutput": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,42 +0,0 @@
|
|||
{
|
||||
"version": 2,
|
||||
"exports": {
|
||||
"MediaBrowser.Common/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Common.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Common.dll": {}
|
||||
}
|
||||
},
|
||||
"MediaBrowser.Controller/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Controller.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Controller.dll": {}
|
||||
}
|
||||
},
|
||||
"MediaBrowser.Model/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Model.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Model.dll": {}
|
||||
},
|
||||
"contentFiles": {
|
||||
"bin/Release/MediaBrowser.Model.pdb": {
|
||||
"buildAction": "None",
|
||||
"codeLanguage": "any",
|
||||
"copyToOutput": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,32 +0,0 @@
|
|||
{
|
||||
"version": 2,
|
||||
"exports": {
|
||||
"MediaBrowser.Common/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Common.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Common.dll": {}
|
||||
}
|
||||
},
|
||||
"MediaBrowser.Model/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETPortable,Version=v4.5,Profile=Profile7",
|
||||
"compile": {
|
||||
"bin/Release/MediaBrowser.Model.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"bin/Release/MediaBrowser.Model.dll": {}
|
||||
},
|
||||
"contentFiles": {
|
||||
"bin/Release/MediaBrowser.Model.pdb": {
|
||||
"buildAction": "None",
|
||||
"codeLanguage": "any",
|
||||
"copyToOutput": true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue