From bcecc087b0c40784316ae8e745752561b301e6f2 Mon Sep 17 00:00:00 2001
From: bobtseattle <bobtseattle@gmail.com>
Date: Sat, 7 Dec 2019 10:26:01 -0800
Subject: [PATCH] This is a second commit

---
 my-file.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 my-file.txt

diff --git a/my-file.txt b/my-file.txt
new file mode 100644
index 0000000..d760542
--- /dev/null
+++ b/my-file.txt
@@ -0,0 +1 @@
+I am also adding the same file in my-second-branch to test merging.
\ No newline at end of file