From 939ba19fb66e37722cce57c32cedeb521767d4dd Mon Sep 17 00:00:00 2001
From: Bryan Thornbury <brthor@microsoft.com>
Date: Mon, 30 Nov 2015 11:12:39 -0800
Subject: [PATCH] Small Fix

---
 src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs b/src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs
index 11c29ee21..513d548d9 100644
--- a/src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs
@@ -141,7 +141,3 @@ namespace Microsoft.DotNet.Cli.Utils
         }
     }
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 8a53c73... E2E Testing First pass. Test each command in a sequence to mock what a user might do.