From 68191b6a1d03d9cc7fdbd92732871bbf0ba28856 Mon Sep 17 00:00:00 2001 From: Carson McManus Date: Mon, 22 Aug 2016 11:56:21 -0400 Subject: [PATCH] removed some lines added by git --- Program.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Program.cs b/Program.cs index 7706371..05f5159 100644 --- a/Program.cs +++ b/Program.cs @@ -31,11 +31,7 @@ public static class Program Console.WriteLine(); Console.WriteLine("--help, -h Display this help message."); Console.WriteLine("--verbose, -v Display some extra information when the program is running."); -<<<<<<< HEAD Console.WriteLine("--user, -u Specify an account for which to generate a Steam Gaurd code."); -======= - Console.WriteLine("--user, -c Specify an account for which to generate a Steam Gaurd code."); ->>>>>>> 941f37b92f12659de928739c11817266fccb35db Console.WriteLine(" Otherwise, the first account will be selected."); return; }