From 90f116942e682541fa8a7c404e0fdfe6da2f2df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=AC=BD=E5=BC=98?=
 <aacxx@wangqinhongs-MacBook-Pro.local>
Date: Thu, 30 Jan 2025 17:07:12 +0800
Subject: [PATCH] edit modules1

---
 exercises/modules/modules1.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
index a26f5c45d..4afc8c3d1 100644
--- 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 {