From 6e8cef7d1366ada34c93b6573a88f9b9231b36e7 Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Wed, 14 Oct 2015 12:09:27 -0700 Subject: [PATCH] Fix build error. --- test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPackTests.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPackTests.cs b/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPackTests.cs index d28c8d821..57c81afe1 100644 --- a/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPackTests.cs +++ b/test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPackTests.cs @@ -2,12 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; -<<<<<<< 87a241624c0efb80b5e34e8fff185ec7d7e3148a -using System.Runtime.Versioning; -======= using System.Linq; using System.Reflection; ->>>>>>> Flow project.json properties into the assembly. using Microsoft.AspNet.Testing.xunit; using Microsoft.Dnx.Testing.Framework; using Newtonsoft.Json.Linq;