edit modules1

LearningOS · Jan 30, 2025 · 90f1169 · 90f1169
1 parent 53f9b71
commit 90f1169
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
@@ -3,6 +3,10 @@
 // Execute `rustlings hint modules1` or use the `hint` watch subcommand for a
 // hint.
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 27d78e2 (edit modules1)
 mod sausage_factory {
     // Don't let anybody outside of this module see this!
     fn get_secret_recipe() -> String {