merge conflict

GamesCrafters · Nov 29, 2023 · ee7d8f8 · ee7d8f8
2 parents 094a336 + 5af345e
commit ee7d8f8
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/src/games/crossteaser/variants.rs b/src/games/crossteaser/variants.rs
@@ -42,6 +42,7 @@ pub fn parse_variant(variant: Variant) -> Result<Session, NovaError> {
 }
 
 /* VARIANT STRING VERIFICATION */
+
 fn check_variant_pattern(variant: &Variant) -> Result<(), NovaError> {
     let re = Regex::new(VARIANT_PATTERN).unwrap();
     if !re.is_match(&variant) {
@@ -138,16 +139,6 @@ mod test {
         assert!(with_default.is_ok());
     }
 
-    // #[test]
-    // fn no_variant_equals_default_variant() {
-    //     let with_none = Session::initialize(None).unwrap();
-    //     let with_default =
-    //         Session::initialize(Some(VARIANT_DEFAULT.to_owned())).unwrap();
-    //
-    //     // Check these two things generated identical `Session`s.
-    //     todo!()
-    // }
-
     #[test]
     fn invalid_variants_fail_checks() {
         let some_variant_1 = Session::initialize(Some("None".to_owned()));