removed some lines added by git

This commit is contained in:
Carson McManus 2016-08-22 11:56:21 -04:00
parent 69e52b3b42
commit 68191b6a1d

View file

@ -31,11 +31,7 @@ public static class Program
Console.WriteLine(); Console.WriteLine();
Console.WriteLine("--help, -h Display this help message."); Console.WriteLine("--help, -h Display this help message.");
Console.WriteLine("--verbose, -v Display some extra information when the program is running."); 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, -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."); Console.WriteLine(" Otherwise, the first account will be selected.");
return; return;
} }