From dd78c8a73993f68e93d3999c81c0ce99c76d06f0 Mon Sep 17 00:00:00 2001
From: Samia-A-Mohamed <samiaamoham@egmai.com>
Date: Sat, 18 Nov 2023 21:21:09 +0000
Subject: [PATCH] new feature-2.py

---
 feature-2.py. | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 feature-2.py.

diff --git a/feature-2.py. b/feature-2.py.
new file mode 100644
index 0000000..4a05f2a
--- /dev/null
+++ b/feature-2.py.
@@ -0,0 +1 @@
+# This line in feature-2 will create a merge conflict, I messed up, trying to rectify