From 3f46e26b70b4ac71b00fe7dc2a0d620780df02dd Mon Sep 17 00:00:00 2001
From: Gladys Rotich <gladysjerono86@gmail.com>
Date: Thu, 5 Aug 2021 12:02:35 +0300
Subject: [PATCH 1/2] added second line

---
 my_file | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 my_file

diff --git a/my_file b/my_file
new file mode 100644
index 00000000..75022169
--- /dev/null
+++ b/my_file
@@ -0,0 +1,2 @@
+Hello world!
+my first code

From 887f9978df19e7f95f55c4647266a7d73011f728 Mon Sep 17 00:00:00 2001
From: Gladys Rotich <gladysjerono86@gmail.com>
Date: Thu, 5 Aug 2021 12:56:06 +0300
Subject: [PATCH 2/2] my_file2 before merge conflict

---
 my_file  | 2 +-
 my_file2 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 my_file2

diff --git a/my_file b/my_file
index 75022169..9c69391f 100644
--- a/my_file
+++ b/my_file
@@ -1,2 +1,2 @@
 Hello world!
-my first code
+my first github exercise
diff --git a/my_file2 b/my_file2
new file mode 100644
index 00000000..cd087558
--- /dev/null
+++ b/my_file2
@@ -0,0 +1 @@
+Hello world!