lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Luke Pulverenti 2016-11-01 00:39:11 -04:00
parent ef8eece6d4
commit c74acaae59
3 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Emby.Common.Implementations/project.fragment.lock.json
View File

@ -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
}
}
}
}
}

42
Emby.Dlna/project.fragment.lock.json
View File

@ -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
}
}
}
}
}

32
Mono.Nat/project.fragment.lock.json
View File

@ -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
}
}
}
}
}