Fix build error.

aspnet · Oct 14, 2015 · 6e8cef7 · 6e8cef7
1 parent b281692
commit 6e8cef7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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;