From efa34375809e455e9c1035bb515dd1b3d33a943e Mon Sep 17 00:00:00 2001
From: Shiv Wagh <shivwagh3055@gmail.com>
Date: Sat, 25 Oct 2025 03:27:07 -0400
Subject: [PATCH 1/2] Fix typo in README footer

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b103466..2a2b1d7 100644
--- a/README.md
+++ b/README.md
@@ -13,4 +13,4 @@ Output
    simple interest = p*t*r
 ```
 
-_© 2022 XYZ, Inc._
+_© 2023 XYZ, Inc._

From bbe31dddda83af200b4e10f1013c763e751519a3 Mon Sep 17 00:00:00 2001
From: Shiv Wagh <shivwagh3055@gmail.com>
Date: Sat, 25 Oct 2025 03:35:21 -0400
Subject: [PATCH 2/2] Revert "Update README.md"

This reverts commit d8324ad0ec067ab2eb9af55d2819104be2e42e3f.
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 2a2b1d7..66b9b77 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Introduction to Git and GitHub
 
 ## Simple Interest Calculator
@@ -14,3 +15,6 @@ Output
 ```
 
 _© 2023 XYZ, Inc._
+=======
+# coding-project-template
+>>>>>>> parent of d8324ad (Update README.md)