Introduce conflicting change for the1Riddle (version 2)

rezzcode · rezzcode · commit d9e9bf8d749a · 2025-07-30T16:23:20.000Z
diff --git a/Solutions/Conflict-fixes/the1Riddle-code_scenario.rs b/Solutions/Conflict-fixes/the1Riddle-code_scenario.rs
@@ -1,12 +1,12 @@
 /**
- * A program that takes a value, eg 1 and returns its type
+ * A program that takes a value, eg b, and returns its type
  * plus other types
  * 
- * Note: the program does not accept strings
+ * Note: the program doesn't accept strings
  * 
  * How to use: 
- * rezzcode@linux$ rustc get_type.rs
- * rezzcode@linux$ ./get_type.rs 4
+ * rezzcode@linux$ rustc code_scenario.rs
+ * rezzcode@linux$ ./code_scenario.rs 8
  * 
  * 4 is of type i32: 4 bytes
  * Other types:

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`/**`
`2`		`- * A program that takes a value, eg 1 and returns its type`
	`2`	`+ * A program that takes a value, eg b, and returns its type`
`3`	`3`	`* plus other types`
`4`	`4`	`*`
`5`		`- * Note: the program does not accept strings`
	`5`	`+ * Note: the program doesn't accept strings`
`6`	`6`	`*`
`7`	`7`	`* How to use:`
`8`		`- * rezzcode@linux$ rustc get_type.rs`
`9`		`- * rezzcode@linux$ ./get_type.rs 4`
	`8`	`+ * rezzcode@linux$ rustc code_scenario.rs`
	`9`	`+ * rezzcode@linux$ ./code_scenario.rs 8`
`10`	`10`	`*`
`11`	`11`	`* 4 is of type i32: 4 bytes`
`12`	`12`	`* Other types:`