fix merge conflicts

Emby.Common.Implementations/project.fragment.lock.json

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

Emby.Dlna/project.fragment.lock.json

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

Mono.Nat/project.fragment.lock.json

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