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.