Cleanup

Author: jkotalik

src/Framework/Framework.UnitTests/SharedFxTests.cs

@@ -43,14 +43,6 @@ public void ItContainsValidDepsJson(SharedFxConfig config)
             Assert.NotNull(depsFile["compilationOptions"]);
             Assert.Empty(depsFile["compilationOptions"]);
             Assert.NotEmpty(depsFile["runtimes"][config.RuntimeIdentifier]);
-<<<<<<< HEAD:src/Framework/Framework.UnitTests/SharedFxTests.cs
-            Assert.All(depsFile["libraries"], item =>
-            {
-                var prop = Assert.IsType<JProperty>(item);
-                var lib = Assert.IsType<JObject>(prop.Value);
-                Assert.Equal("package", lib["type"].Value<string>());
-                Assert.StartsWith("sha512-", lib["sha512"].Value<string>());
-=======
 
             var targetLibraries = depsFile["targets"][target];
             Assert.All(targetLibraries, libEntry =>
@@ -72,7 +64,6 @@ public void ItContainsValidDepsJson(SharedFxConfig config)
                     Assert.NotNull(fileVersion);
                     Assert.NotEmpty(fileVersion.Value<string>());
                 });
->>>>>>> release/2.1:test/SharedFx.UnitTests/SharedFxTests.cs
             });
         }