From c74acaae59ff595eb05f335cad8695f98bda1a8b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Nov 2016 00:39:11 -0400
Subject: fix merge conflicts

---
 .../project.fragment.lock.json                     | 32 ----------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 Emby.Common.Implementations/project.fragment.lock.json

(limited to 'Emby.Common.Implementations')

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
-- 
cgit v1.2.3