added uncommitted change

src/main.rs

@@ -148,13 +148,9 @@ fn main() {
 		Some("polyamory" | "polyamorous" | "poly")
 			=>	complex::polyamory(small),
 
-<<<<<<< HEAD
-		Some("progress")
-			=>	complex::progress(small),
-=======
 		Some("transgender" | "trans")
 			=>	flag::transgender(),
->>>>>>> main
+
 
 		_ => { help::help_text(); exit(1) }
 	};
@@ -163,54 +159,3 @@ fn main() {
 
 }
 
-<<<<<<< HEAD
-=======
-fn help_text() {
-	println!("pride v{VERSION}");
-	println!("Valerie Wolfe <sleeplessval@gmail.com>");
-	println!("Show pride flags in the terminal.\n");
-
-	println!("usage: pride [flags] [name]\n");
-
-	println!("args:");
-	println!("   <name>         The pride flag to display\n");
-
-	println!("flags:");
-	println!("   -h, --help     Shows this help text");
-	println!("   --version      Show version information");
-	println!("   -l, --list     Prints a list of printable flags");
-	println!("   -s, --small    Prints a small version without holding");
-
-	println!("\nUse 'pride --list' to see a list of printable flags");
-	println!("\n~ You're loved and you matter ♥");
-}
-
-fn list_text() {
-	println!("pride v{}", env!("CARGO_PKG_VERSION"));
-	println!("\nFlag list:");
-	println!("   agender                agender pride flag");
-	println!("   aro, aromantic         aromantic pride flag");
-	println!("   ace, asexual           asexual pride flag");
-	println!("   aroace                 aromantic/asexual pride flag");
-	println!("   bigender               bigender pride flag");
-	println!("   bi, bisexual           bisexual pride flag");
-	println!("   demiromantic           demiromantic pride flag");
-	println!("   demisexual             demisexual pride flag");
-//	println!("   disability             disability pride flag");
-	println!("   gay, mlm               gay men pride flag");
-	println!("   genderfluid            genderfluid pride flag");
-	println!("   gender-nonconforming   gender nonconforming pride flag");
-	println!("   genderqueer            genderqueer pride flag");
-	println!("   gendervoid             gendervoid pride flag");
-//	println!("   intersex               intersex pride flag");
-	println!("   lesbian                lesbian pride flag");
-	println!("   multigender            multigender pride flag");
-	println!("   nb, nonbinary          nonbinary pride flag");
-	println!("   pan, pansexual         pansexual pride flag");
-	println!("   polyamory              polyamorous pride flag");
-	println!("   pride, rainbow         six-color rainbow flag");
-	println!("   progress               progress arrow flag");
-	println!("   trans, transgender     transgender pride flag");
-}
-
->>>>>>> main