diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-01 00:39:11 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-11-01 00:39:11 -0400 |
| commit | c74acaae59ff595eb05f335cad8695f98bda1a8b (patch) | |
| tree | 50181fb977ff5b03693af7d20a8aa332c3442251 | |
| parent | ef8eece6d4ef3466559e8e4577fb3fb87f78dd84 (diff) | |
fix merge conflicts
| -rw-r--r-- | Emby.Common.Implementations/project.fragment.lock.json | 32 | ||||
| -rw-r--r-- | Emby.Dlna/project.fragment.lock.json | 42 | ||||
| -rw-r--r-- | Mono.Nat/project.fragment.lock.json | 32 |
3 files changed, 0 insertions, 106 deletions
diff --git a/Emby.Common.Implementations/project.fragment.lock.json b/Emby.Common.Implementations/project.fragment.lock.json deleted file mode 100644 index 0d8df5a0e..000000000 --- a/Emby.Common.Implementations/project.fragment.lock.json +++ /dev/null @@ -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 - } - } - } - } -}
\ No newline at end of file diff --git a/Emby.Dlna/project.fragment.lock.json b/Emby.Dlna/project.fragment.lock.json deleted file mode 100644 index df837d207..000000000 --- a/Emby.Dlna/project.fragment.lock.json +++ /dev/null @@ -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 - } - } - } - } -}
\ No newline at end of file diff --git a/Mono.Nat/project.fragment.lock.json b/Mono.Nat/project.fragment.lock.json deleted file mode 100644 index 0d8df5a0e..000000000 --- a/Mono.Nat/project.fragment.lock.json +++ /dev/null @@ -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 - } - } - } - } -}
\ No newline at end of file |